horza 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85bbbb02cee6bd4f2fe40c56bd9c37d16307b22f
-  data.tar.gz: 0398edae9ed16b2bb8d13650b1869741e8213a2c
+  metadata.gz: 17772e0cbf9e727f3f7faa1cb164fde24a25d962
+  data.tar.gz: 54b00c21a99e3b706c4d3154a35bea05f4b8e8f7
 SHA512:
-  metadata.gz: f890a99acceefb96521d07a8b0ef41a290438f4672f917bfefd68cc0085379de73dd050de8eff44b442bb0f91daa7e4a39f409893200bc2b2dd4d82dd4560347
-  data.tar.gz: 98f821f258db1e72ce67439eb7aff920098a5c941954cb5fc8192ff491b68a7b12bd8247ce3aee336db9c14ed405a22ccb17b8e96d25195f70f58e767820aa59
+  metadata.gz: 85558cd6b04bb398969a19b635df243401246ea8ce5a05b72f08bd4fd9995636a5eed3e33bb8b7c2b249803e0e9863cb8b95e15601c5f472acb85b432f0cc3f4
+  data.tar.gz: d734305118e77162d4122696df034cf9cf29394d11a49eea3ed251c44e4d9af85bc9fe1e7adf64258e563463018f7f00651efe1a544515a58503483984b93847

data/README.md

@@ -147,3 +147,9 @@ module CustomEntities
   end
 end
 ```
+
+## Active Model Semantics
+
+The returned entity for ActiveRecord adapter now include ActiveModel semantics. This type of
+entity SingleWithActiveModel can work with rails form helper and the submitted params will be
+grouped under params[:horza_entities_single_with_active_model].

data/lib/horza.rb

@@ -7,6 +7,7 @@ require 'horza/adapters/active_record/arel_join'
 require 'horza/core_extensions/string'
 require 'horza/entities/single'
 require 'horza/entities/collection'
+require 'horza/entities/single_with_active_model'
 require 'horza/entities'
 require 'horza/configuration'
 require 'horza/errors'

data/lib/horza/adapters/active_record/active_record.rb

@@ -5,6 +5,10 @@ module Horza
       CONTEXT_NAMESPACE = ::ActiveRecord::Base
 
       class << self
+        def single_entity_klass
+          ::Horza::Entities::SingleWithActiveModel
+        end
+
         def entity_context_map
           # Rails doesn't preload classes in development mode, caching doesn't make sense
           return ::Horza.descendants_map(CONTEXT_NAMESPACE) if ::Horza.configuration.development_mode
@@ -21,21 +25,21 @@ module Horza
       end
 
       def get!(id)
-        run_and_convert_exceptions { entity_class(@context.find(id).attributes) }
+        run_and_convert_exceptions { entity(@context.find(id).attributes) }
       end
 
       def find_first!(options = {})
-        run_and_convert_exceptions { entity_class(query(options).first!.attributes) }
+        run_and_convert_exceptions { entity(query(options).first!.attributes) }
       end
 
       def find_all(options = {})
-        run_and_convert_exceptions { entity_class(query(options)) }
+        run_and_convert_exceptions { entity(query(options)) }
       end
 
       def join(options = {})
         run_and_convert_exceptions do
           sql = ArelJoin.sql(self.context, options)
-          entity_class(::ActiveRecord::Base.connection.exec_query(sql).to_a)
+          entity(::ActiveRecord::Base.connection.exec_query(sql).to_a)
         end
       end
 
@@ -43,7 +47,7 @@ module Horza
         run_and_convert_exceptions do
           record = @context.new(options)
           record.save!
-          entity_class(record.attributes)
+          entity(record.attributes)
         end
       end
 
@@ -59,7 +63,7 @@ module Horza
           record = @context.find(id)
           record.assign_attributes(options)
           record.save!
-          entity_class(record.attributes)
+          entity(record.attributes)
         end
       end
 
@@ -82,7 +86,7 @@ module Horza
           result = walk_family_tree(base, options)
           return nil unless result
 
-          options.target.to_s.plural? ? entity_class(query(options, result)) : entity_class(result.attributes)
+          options.target.to_s.plural? ? entity(query(options, result)) : entity(result.attributes)
         end
       end
 

data/lib/horza/adapters/class_methods.rb

@@ -38,6 +38,14 @@ module Horza
       def not_implemented_error
         raise ::Horza::Errors::MethodNotImplemented, 'You must implement this method in your adapter.'
       end
+
+      def single_entity_klass
+        ::Horza::Entities::Single
+      end
+
+      def collection_entity_klass
+        ::Horza::Entities::Collection
+      end
     end
   end
 end

data/lib/horza/adapters/instance_methods.rb

@@ -44,8 +44,9 @@ module Horza
         raise self.class.horza_error_from_orm_error(e.class).new(e.message)
       end
 
-      def entity_class(res = @context)
-        collection?(res) ? ::Horza::Entities.collection_entity_for(entity_symbol).new(res) : ::Horza::Entities.single_entity_for(entity_symbol).new(res)
+      def entity(res = @context)
+        collection?(res) ? ::Horza::Entities.collection_entity_for(entity_symbol, res) :
+          ::Horza::Entities.single_entity_for(entity_symbol, res)
       end
 
       def entity_symbol

data/lib/horza/entities.rb

@@ -1,16 +1,18 @@
 module Horza
   module Entities
     class << self
-      def single_entity_for(entity_symbol)
-        single_entities[entity_symbol] || ::Horza::Entities::Single
+      def single_entity_for(entity_symbol, attributes)
+        klass = single_entities[entity_symbol] || Horza.adapter.single_entity_klass
+        klass.new(attributes)
       end
 
       def single_entities
         @singles ||= ::Horza.descendants_map(::Horza::Entities::Single)
       end
 
-      def collection_entity_for(entity_symbol)
-        collection_entities[entity_symbol] || ::Horza::Entities::Collection
+      def collection_entity_for(entity_symbol, attributes)
+        klass = collection_entities[entity_symbol] || Horza.adapter.collection_entity_klass
+        klass.new(attributes)
       end
 
       def collection_entities

data/lib/horza/entities/collection.rb

@@ -1,8 +1,8 @@
 module Horza
   module Entities
     class Collection
-      def initialize(collection, singular_entity = nil)
-        @collection, @singular_entity = collection, singular_entity
+      def initialize(collection)
+        @collection = collection
       end
 
       def [](index)
@@ -27,15 +27,11 @@ module Horza
         end
       end
 
-      def singular_entity(record)
-        attributes = record.respond_to?(:to_hash) ? record.to_hash : Horza.adapter.new(record).to_hash
-        singular_entity_class(record).new(attributes)
-      end
-
       # Collection classes have the form Horza::Entities::Users
       # Single output requires the form Horza::Entities::User
-      def singular_entity_class(record)
-        @singular_entity ||= ::Horza::Entities::single_entity_for(record.class.name.split('::').last.symbolize)
+      def singular_entity(record)
+        attributes = record.respond_to?(:to_hash) ? record.to_hash : Horza.adapter.new(record).to_hash
+        ::Horza::Entities::single_entity_for(record.class.name.split('::').last.symbolize, attributes)
       end
     end
   end

data/lib/horza/entities/single_with_active_model.rb

@@ -0,0 +1,17 @@
+require 'active_model/naming'
+require 'active_model/validations'
+require 'active_model/conversion'
+
+module Horza
+  module Entities
+    class SingleWithActiveModel < Single
+      include ActiveModel::Validations
+      include ActiveModel::Conversion
+      extend ActiveModel::Naming
+
+      def persisted?
+        false
+      end
+    end
+  end
+end

data/spec/active_record_spec.rb

@@ -72,7 +72,7 @@ describe Horza do
   context '#context_for_entity' do
     context 'when model exists' do
       it 'Returns correct class' do
-        expect(Horza.adapter.context_for_entity(:simple_record)).to eq SimpleRecord
+        expect(Horza.adapter.context_for_entity(:simple_record).to_s).to eq 'SimpleRecord'
       end
     end
 
@@ -102,7 +102,7 @@ describe Horza do
 
       context 'when model exists' do
         it 'Returns correct class' do
-          expect(Horza.adapter.context_for_entity(:simple_record)).to eq SimpleRecord
+          expect(Horza.adapter.context_for_entity(:simple_record).to_s).to eq 'SimpleRecord'
         end
       end
 
@@ -149,6 +149,7 @@ describe Horza do
 
   describe 'Queries' do
     let(:user) { HorzaSpec::User.create }
+    let(:single_entity_klass) { Horza::Entities::Single }
 
     describe '#get!' do
       context 'when user exists' do
@@ -675,13 +676,15 @@ describe Horza do
         3.times.map { HorzaSpec::User.create }
       end
 
+      let(:single_entity_klass) { Horza::Entities::SingleWithActiveModel }
+
       subject { Horza::Entities::Collection.new(members) }
 
       context '#each' do
         context 'when name is of ancestry type' do
           it 'yields a Horza::Entities::Single with each iteration' do
             subject.each do |member|
-              expect(member.is_a? Horza::Entities::Single).to be true
+              expect(member.is_a? single_entity_klass).to be true
             end
           end
         end
@@ -711,7 +714,7 @@ describe Horza do
         context 'when name is of ancestry type' do
           it 'returns the last collection item as a Horza::Entities::Single' do
             entity = subject.pop
-            expect(entity.is_a? Horza::Entities::Single).to be true
+            expect(entity.is_a? single_entity_klass).to be true
           end
         end
       end
@@ -726,7 +729,7 @@ describe Horza do
           end
 
           it 'returns Horza::Collection::Single' do
-            expect(TestNamespace::DummyModels.new([]).send(:singular_entity_class, dummy_model)).to eq Horza::Entities::Single
+            expect(TestNamespace::DummyModels.new([]).send(:singular_entity, dummy_model).is_a? single_entity_klass).to be true
           end
         end
 
@@ -742,7 +745,7 @@ describe Horza do
           end
 
           it 'returns the existing singular class' do
-            expect(TestNamespace::OtherDummyModels.new([]).send(:singular_entity_class, other_dummy_model)).to eq TestNamespace::OtherDummyModel
+            expect(TestNamespace::OtherDummyModels.new([]).send(:singular_entity, other_dummy_model).is_a? TestNamespace::OtherDummyModel).to be true
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: horza
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Blake Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -115,6 +115,7 @@ files:
 - lib/horza/entities.rb
 - lib/horza/entities/collection.rb
 - lib/horza/entities/single.rb
+- lib/horza/entities/single_with_active_model.rb
 - lib/horza/errors.rb
 - spec/active_record_spec.rb
 - spec/horza_spec.rb