horza 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad75669d3af7d16418b004a3c6ddea50258d8ae7
-  data.tar.gz: dc77c4becdffc82ff00016ad6a7f84c49be6965a
+  metadata.gz: 75fcb74059583a6a1d2db95b90c205df028f4ca4
+  data.tar.gz: f3580ea7b8820ddf78398e0eb241b73f6c66f160
 SHA512:
-  metadata.gz: fb4f6e4a305f50191357ff2fa7aed0e962961d12f020210833d45ca0b85ecd401835fb41576d37167ee285462a7355013dfd1309cf0eeeda0c821f9384cc7857
-  data.tar.gz: f434ceacd8d0c426c2ab251ed547c675602599de999e10f9d2666c907742b3989b1d63ec4fbb5d6148831216df2c8339883506ac03818abcc6d55fd91ee7f1f5
+  metadata.gz: 2d8c3d3399690a7214c944a67a6960826d429367326266bac3561f0a5095db8a9285aab13cf348bf9665e80c201ae2c5a459cc6b7c9ab2b6e0a71fea82b6cb6e
+  data.tar.gz: e206eb74ba5391dfd7ee5ffad4994cdf7e44e12bbb19fb901f132c7792d2543052244b00eb7100f3219749a411efdf880c4390b16f15ea5640e27796752e0139

data/lib/horza.rb

@@ -1,3 +1,5 @@
+require 'horza/adapters/class_methods'
+require 'horza/adapters/instance_methods'
 require 'horza/adapters/abstract_adapter'
 require 'horza/adapters/active_record'
 require 'horza/core_extensions/string'
@@ -6,7 +8,7 @@ require 'horza/entities/collection'
 require 'horza/entities'
 require 'horza/configuration'
 require 'horza/errors'
-require 'active_support/inflector'
+require 'active_support'
 
 module Horza
   extend Configuration

data/lib/horza/adapters/abstract_adapter.rb

@@ -1,44 +1,25 @@
 module Horza
   module Adapters
     class AbstractAdapter
+      extend ::Horza::Adapters::ClassMethods
+      include ::Horza::Adapters::InstanceMethods
+
       attr_reader :context
 
       class << self
-        def expected_errors
-          [::Horza::Errors::RecordNotFound, ::Horza::Errors::RecordInvalid]
-        end
-
-        def context_for_entity(entity)
+        def expected_errors_map
           not_implemented_error
         end
 
         def entity_context_map
           not_implemented_error
         end
-
-        def not_implemented_error
-          raise ::Horza::Errors::MethodNotImplemented, 'You must implement this method in your adapter.'
-        end
-      end
-
-      def initialize(context)
-        @context = context
       end
 
-      def get(options = {})
-        get!(options)
-      rescue *self.class.expected_errors
-      end
-
-      def get!(options = {})
+      def get!(id)
         not_implemented_error
       end
 
-      def find_first(options = {})
-        find_first!(options)
-      rescue *self.class.expected_errors
-      end
-
       def find_first!(options = {})
         not_implemented_error
       end
@@ -47,29 +28,14 @@ module Horza
         not_implemented_error
       end
 
-      def create(options = {})
-        create!(options)
-      rescue *self.class.expected_errors
-      end
-
       def create!(options = {})
         not_implemented_error
       end
 
-      def delete(id)
-        delete!(id)
-      rescue *self.class.expected_errors
-      end
-
       def delete!(id)
         not_implemented_error
       end
 
-      def update(id, options = {})
-        update!(id, options)
-      rescue *self.class.expected_errors
-      end
-
       def update!(id, options = {})
         not_implemented_error
       end
@@ -78,27 +44,14 @@ module Horza
         not_implemented_error
       end
 
-      def eager_load(options = {})
-        not_implemented_error
-      end
-
       def to_hash
         not_implemented_error
       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)
-      end
-
       private
 
-      def not_implemented_error
-        self.class.not_implemented_error
-      end
-
-      def entity_symbol
-        klass = @context.name.split('::').last
-        collection? ? klass.pluralize.symbolize : klass.symbolize
+      def collection?
+        not_implemented_error
       end
     end
   end

data/lib/horza/adapters/active_record.rb

@@ -4,64 +4,65 @@ module Horza
       INVALID_ANCESTRY_MSG = 'Invalid relation. Ensure that the plurality of your associations is correct.'
 
       class << self
-        def context_for_entity(entity)
-          entity_context_map[entity]
-        end
-
         def entity_context_map
+          # Rails doesn't preload classes in development mode, caching doesn't make sense
+          return ::Horza.descendants_map(::ActiveRecord::Base) if ::Horza.configuration.development_mode
           @map ||= ::Horza.descendants_map(::ActiveRecord::Base)
         end
+
+        def expected_errors_map
+          {
+            ::ActiveRecord::RecordNotFound => Horza::Errors::RecordNotFound,
+            ::ActiveRecord::RecordInvalid => Horza::Errors::RecordInvalid
+          }
+        end
       end
 
       def get!(id)
-        entity_class(@context.find(id).attributes)
-      rescue ::ActiveRecord::RecordNotFound => e
-        raise Horza::Errors::RecordNotFound.new(e)
+        run_and_convert_exceptions { entity_class(@context.find(id).attributes) }
       end
 
       def find_first!(options = {})
-        entity_class(base_query(options).first!.attributes)
-      rescue ::ActiveRecord::RecordNotFound => e
-        raise Horza::Errors::RecordNotFound.new(e)
+        run_and_convert_exceptions { entity_class(base_query(options).first!.attributes) }
       end
 
       def find_all(options = {})
-        entity_class(base_query(options))
+        run_and_convert_exceptions { entity_class(base_query(options)) }
       end
 
       def create!(options = {})
-        record = @context.new(options)
-        record.save!
-        entity_class(record.attributes)
-      rescue ::ActiveRecord::RecordInvalid => e
-        raise Horza::Errors::RecordInvalid.new(e)
+        run_and_convert_exceptions do
+          record = @context.new(options)
+          record.save!
+          entity_class(record.attributes)
+        end
       end
 
       def update!(id, options = {})
-        record = @context.find(id)
-        record.assign_attributes(options)
-        record.save!
-        record
-      rescue ::ActiveRecord::RecordNotFound => e
-        raise Horza::Errors::RecordNotFound.new(e)
-      rescue ::ActiveRecord::RecordInvalid => e
-        raise Horza::Errors::RecordInvalid.new(e)
+        run_and_convert_exceptions do
+          record = @context.find(id)
+          record.assign_attributes(options)
+          record.save!
+          entity_class(record.attributes)
+        end
       end
 
       def delete!(id)
-        record = @context.find(id)
-        record.destroy!
-        true
-      rescue ::ActiveRecord::RecordNotFound => e
-        raise Horza::Errors::RecordNotFound.new(e)
+        run_and_convert_exceptions do
+          record = @context.find(id)
+          record.destroy!
+          true
+        end
       end
 
       def ancestors(options = {})
-        result = walk_family_tree(@context.find(options[:id]), options)
+        run_and_convert_exceptions do
+          result = walk_family_tree(@context.find(options[:id]), options)
 
-        return nil unless result
+          return nil unless result
 
-        collection?(result) ? entity_class(result) : entity_class(result.attributes)
+          collection?(result) ? entity_class(result) : entity_class(result.attributes)
+        end
       end
 
       def to_hash

data/lib/horza/adapters/class_methods.rb

@@ -0,0 +1,25 @@
+module Horza
+  module Adapters
+    module ClassMethods
+      def expected_horza_errors
+        [Horza::Errors::RecordNotFound, Horza::Errors::RecordInvalid]
+      end
+
+      def expected_errors
+        expected_errors_map.keys
+      end
+
+      def horza_error_from_orm_error(orm_error)
+        expected_errors_map[orm_error]
+      end
+
+      def context_for_entity(entity)
+        entity_context_map[entity]
+      end
+
+      def not_implemented_error
+        raise ::Horza::Errors::MethodNotImplemented, 'You must implement this method in your adapter.'
+      end
+    end
+  end
+end

data/lib/horza/adapters/instance_methods.rb

@@ -0,0 +1,87 @@
+module Horza
+  module Adapters
+    module InstanceMethods
+
+      def initialize(context)
+        @context = context
+      end
+
+      def get(id)
+        run_quietly { get!(id) }
+      end
+
+      def find_first(options = {})
+        run_quietly { find_first!(options) }
+      end
+
+      def create(options = {})
+        run_quietly { create!(options) }
+      end
+
+      def delete(id)
+        run_quietly { delete!(id) }
+      end
+
+      def update(id, options = {})
+        run_quietly { update!(id, options) }
+      end
+
+      protected
+
+      def run_quietly(&block)
+        block.call
+      rescue *self.class.expected_horza_errors
+      end
+
+      # Execute the code block and convert ORM exceptions into Horza exceptions
+      def run_and_convert_exceptions(&block)
+        block.call
+      rescue *self.class.expected_errors => e
+        raise self.class.horza_error_from_orm_error(e.class)
+      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)
+      end
+
+      def entity_symbol
+        klass = @context.name.split('::').last
+        collection? ? klass.pluralize.symbolize : klass.symbolize
+      end
+
+      # given an options hash,
+      # with optional :conditions, :order, :limit and :offset keys,
+      # returns conditions, normalized order, limit and offset
+      def extract_conditions!(options = {})
+        order      = normalize_order(options.delete(:order))
+        limit      = options.delete(:limit)
+        offset     = options.delete(:offset)
+        conditions = options.delete(:conditions) || options
+
+        [conditions, order, limit, offset]
+      end
+
+      # given an order argument, returns an array of pairs, with each pair containing the attribute, and :asc or :desc
+      def normalize_order(order)
+        order = Array(order)
+
+        if order.length == 2 && !order[0].is_a?(Array) && [:asc, :desc].include?(order[1])
+          order = [order]
+        else
+          order = order.map {|pair| pair.is_a?(Array) ? pair : [pair, :asc] }
+        end
+
+        order.each do |pair|
+          pair.length == 2 or raise ArgumentError, "each order clause must be a pair (unknown clause #{pair.inspect})"
+          [:asc, :desc].include?(pair[1]) or raise ArgumentError, "order must be specified with :asc or :desc (unknown key #{pair[1].inspect})"
+        end
+
+        order
+      end
+
+      def not_implemented_error
+        self.class.not_implemented_error
+      end
+    end
+  end
+end

data/lib/horza/configuration.rb

@@ -35,6 +35,6 @@ module Horza
   end
 
   class Config
-    attr_accessor :adapter
+    attr_accessor :adapter, :development_mode
   end
 end

data/spec/active_record_spec.rb

@@ -59,6 +59,28 @@ describe Horza do
     HorzaSpec::Employer.delete_all
   end
 
+  context '#context_for_entity' do
+    it 'Returns correct class' do
+      expect(Horza.adapter.context_for_entity(:user)).to eq HorzaSpec::User
+    end
+
+    context 'in development mode' do
+      before do
+        Horza.reset
+        Horza.configure do |config|
+          config.adapter = adapter
+          config.development_mode = true
+        end
+      end
+      after do
+        Horza.reset
+      end
+      it 'Returns correct class' do
+        expect(Horza.adapter.context_for_entity(:user)).to eq HorzaSpec::User
+      end
+    end
+  end
+
   describe '#adapter' do
     let(:user) { HorzaSpec::User.create }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: horza
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Blake Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -106,6 +106,8 @@ files:
 - lib/horza.rb
 - lib/horza/adapters/abstract_adapter.rb
 - lib/horza/adapters/active_record.rb
+- lib/horza/adapters/class_methods.rb
+- lib/horza/adapters/instance_methods.rb
 - lib/horza/configuration.rb
 - lib/horza/core_extensions/string.rb
 - lib/horza/entities.rb