verse-ruby 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66aa0cfef339a02f2eddb35464aebd1dddae8cb7
-  data.tar.gz: 2e9942581e183912293c1472418c3c8a302b2020
+  metadata.gz: 3ca14379a3dab2da96706c1f8a1c4725cb39ff6c
+  data.tar.gz: 0d6edc678b1a64bc3295dc1a45992ed5ca0a19dc
 SHA512:
-  metadata.gz: 154fabae3d19ec5f2ad86a27e02aa0f53cfbb20e2bbab84db7e3bb6abc391d16d0e432f25a1e3549a7d31bbd2023eabf59c683ecc14c18dff7cc5ad139641044
-  data.tar.gz: 0d5263667f18a33102fbc962cc9668d74e9bab60bad6d78c0d0c54bd8637259f693a56bfffb6ea652965386b8b26c2393c2f3c81197dbc278167719347e4f1a9
+  metadata.gz: 2589019d44b94ab2518a5b151f74fafea6587a6986a55be1ab3cae775858d67d9af818dbe2b54086d7b93ac4c21858f6b24a436788fa243dd4598e4411ccb8a7
+  data.tar.gz: 2cd730c2766a328704c4825fb7f31b7fbcd3ed506dfe20beece494146d8423b40ff38c4652bda1c071428f9cfaeec7c87d46373ce406f4e8fc01acbdb1391e70

data/lib/verse.rb

@@ -40,7 +40,7 @@ module Verse
         c.use Faraday::Request::UrlEncoded
 
         # Response
-        c.use Her::Middleware::DefaultParseJSON
+        c.use Her::Middleware::SecondLevelParseJSON
 
         # Adapter
         c.use Faraday::Adapter::NetHttp

data/lib/verse/auth.rb

@@ -3,5 +3,6 @@ module Verse
   end
 end
 
-require 'verse/auth/core'
-require 'verse/auth/confirmable'
+require 'verse/auth/email'
+require 'verse/auth/session'
+require 'verse/auth/user'

data/lib/verse/auth/{confirmable/email.rb → email.rb}

@@ -1,4 +1,4 @@
-class Verse::Auth::Confirmable::Email < Verse::Contactable::Email
+class Verse::Auth::Email < Verse::Contactable::Email
   attributes :confirmation_token, :confirmed_at
 
   custom_patch :confirm

data/lib/verse/auth/session.rb

@@ -0,0 +1,7 @@
+class Verse::Auth::Session < Verse::Resource
+  attributes :login, :password, :jwt
+
+  def form_attributes
+    [:login, :password]
+  end
+end

data/lib/verse/auth/user.rb

@@ -0,0 +1,9 @@
+class Verse::Auth::User < Verse::Core::Person
+  alias_attribute :admin_id, :id
+
+  attributes :name, :username, :email, :password, :password_confirmation
+
+  def form_attributes
+    [:name, :username, :email, :password, :password_confirmation]
+  end
+end

data/lib/verse/controller.rb

@@ -1,10 +1,14 @@
 require 'active_support'
 require 'jwt'
 
+require 'verse/controller/strong_params'
+
 module Verse
   module Controller
     extend ActiveSupport::Concern
 
+    include Verse::Controller::StrongParams
+
     included do
       before_action :set_user_token
       helper_method :current_user
@@ -13,9 +17,9 @@ module Verse
     def current_user
       if Verse.user_token
         data = JWT.decode(Verse.user_token, nil, false)[0]['data']
-        Verse::Auth::Core::User.new(
+        Verse::Auth::User.new(
           id: data['user_id'],
-          display_name: data['display_name'],
+          name: data['name'],
           email: data['email'],
           username: data['username']
         )

data/lib/verse/controller/strong_params.rb

@@ -0,0 +1,37 @@
+module Verse
+  module Controller
+    module StrongParams
+      # Verse::Auth / Verse::Contactable
+      def email_attributes; end
+
+      # Verse::Auth
+      def session_attributes
+        params.require(:session).permit(:login, :password)
+      end
+
+      def user_attributes
+        params.require(:user).permit(:name, :username, :email, :password, :password_confirmation)
+      end
+
+      # Verse::Core
+      def entity_attributes
+        params.require(:entity).permit(:name, :slug, { admins_attributes: [:admin_id] })
+      end
+
+      def person_attributes
+        params.require(:person).permit(:name, :slug, { admins_attributes: [:admin_id] })
+      end
+
+      def business_attributes
+        params.require(:business).permit(:name, :slug, { admins_attributes: [:admin_id] })
+      end
+
+      def household_attributes
+        params.require(:household).permit(:name, { admins_attributes: [:admin_id] })
+      end
+
+      # Verse::Relatable
+      def admin_attributes; end
+    end
+  end
+end

data/lib/verse/core.rb

@@ -5,3 +5,5 @@ end
 
 require 'verse/core/entity'
 require 'verse/core/person'
+require 'verse/core/business'
+require 'verse/core/household'

data/lib/verse/core/business.rb

@@ -0,0 +1,2 @@
+class Verse::Core::Business < Verse::Core::Entity
+end

data/lib/verse/core/entity.rb

@@ -1,3 +1,11 @@
 class Verse::Core::Entity < Verse::Resource
-  attributes :slug
+  attributes :name, :slug
+
+  has_many :admins, class_name: 'Verse::Auth::User'
+  has_many :owners, class_name: 'Verse::Core::Entity'
+  has_many :members, class_name: 'Verse::Core::Person'
+
+  def form_attributes
+    [:name, :slug, admins: [:admin_id]]
+  end
 end

data/lib/verse/core/household.rb

@@ -0,0 +1,5 @@
+class Verse::Core::Household < Verse::Core::Entity
+  def form_attributes
+    [:name, admins: [:admin_id]]
+  end
+end

data/lib/verse/core/person.rb

@@ -1,2 +1,14 @@
 class Verse::Core::Person < Verse::Core::Entity
+  has_many :entities, class_name: 'Verse::Core::Entity'
+  has_many :businesses, class_name: 'Verse::Core::Business'
+  has_many :households, class_name: 'Verse::Core::Household'
+  has_many :people, class_name: 'Verse::Core::Person'
+
+  # has_many :administrated_entities
+
+  # has_many :administrated_businesses
+
+  # has_many :administrated_people
+
+  # has_many :administrated_softwares
 end

data/lib/verse/graph.rb

@@ -0,0 +1,6 @@
+module Verse
+  module Graph
+  end
+end
+
+require 'verse/relatable'

data/lib/verse/models.rb

@@ -2,3 +2,4 @@ require 'verse/resource'
 require 'verse/core'
 require 'verse/contactable'
 require 'verse/auth'
+require 'verse/graph'

data/lib/verse/relatable.rb

@@ -0,0 +1,6 @@
+module Verse
+  module Relatable
+  end
+end
+
+require 'verse/relatable/admin'

data/lib/verse/relatable/admin.rb

@@ -0,0 +1,5 @@
+class Verse::Relatable::Admin < Verse::Resource
+  attributes :admin_id, :resource_id
+  belongs_to :admin, class_name: 'Verse::Core::Person'
+  belongs_to :resource, class_name: 'Verse::Core::Entity'
+end

data/lib/verse/resource.rb

@@ -4,9 +4,16 @@ module Verse
 
     include_root_in_json true
 
+    def specific
+      type = attributes[:type]
+      if type
+        "Verse::#{type}".constantize.new(attributes)
+      end
+    end
+
     # Demodulizes model_name e.g. for use in route helpers.
-    def self.model_name		
-      ActiveModel::Name.new(self, nil, name.split('::').last)		
+    def self.model_name
+      ActiveModel::Name.new(self, nil, name.split('::').last)
     end
   end
 end

data/lib/verse/version.rb

@@ -1,3 +1,3 @@
 module Verse
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: verse-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Thom Bruce
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,19 +188,23 @@ files:
 - lib/verse-ruby.rb
 - lib/verse.rb
 - lib/verse/auth.rb
-- lib/verse/auth/confirmable.rb
-- lib/verse/auth/confirmable/email.rb
-- lib/verse/auth/core.rb
-- lib/verse/auth/core/session.rb
-- lib/verse/auth/core/user.rb
+- lib/verse/auth/email.rb
+- lib/verse/auth/session.rb
+- lib/verse/auth/user.rb
 - lib/verse/configuration.rb
 - lib/verse/contactable.rb
 - lib/verse/contactable/email.rb
 - lib/verse/controller.rb
+- lib/verse/controller/strong_params.rb
 - lib/verse/core.rb
+- lib/verse/core/business.rb
 - lib/verse/core/entity.rb
+- lib/verse/core/household.rb
 - lib/verse/core/person.rb
+- lib/verse/graph.rb
 - lib/verse/models.rb
+- lib/verse/relatable.rb
+- lib/verse/relatable/admin.rb
 - lib/verse/resource.rb
 - lib/verse/version.rb
 - verse-ruby.gemspec

data/lib/verse/auth/confirmable.rb

@@ -1,8 +0,0 @@
-module Verse
-  module Auth
-    module Confirmable
-    end
-  end
-end
-
-require 'verse/auth/confirmable/email'

data/lib/verse/auth/core.rb

@@ -1,9 +0,0 @@
-module Verse
-  module Auth
-    module Core
-    end
-  end
-end
-
-require 'verse/auth/core/session'
-require 'verse/auth/core/user'

data/lib/verse/auth/core/session.rb

@@ -1,3 +0,0 @@
-class Verse::Auth::Core::Session < Verse::Resource
-  attributes :login, :password, :jwt
-end

data/lib/verse/auth/core/user.rb

@@ -1,3 +0,0 @@
-class Verse::Auth::Core::User < Verse::Resource
-  attributes :display_name, :username, :email, :password, :password_confirmation
-end