arrest 0.0.89 → 0.0.90

data/lib/arrest.rb

@@ -1,6 +1,7 @@
 require 'logger'
 
 require "arrest/version"
+require "arrest/default_class_loader"
 require 'arrest/helper/logger'
 
 require "arrest/utils/class_utils.rb"

data/lib/arrest/abstract_resource.rb

@@ -16,7 +16,8 @@ module Arrest
     include HasAttributes
     include HasMany
     include HasView
-    attribute :id, String
+
+    attribute :id, :String
 
     attr_accessor :context
 

data/lib/arrest/attributes/attribute.rb

@@ -9,17 +9,28 @@ module Arrest
 
 
   class Attribute
-    attr_accessor :name, :actions, :clazz, :json_name, :dirty
+    attr_accessor :name, :actions, :json_name, :dirty
 
-    def initialize(name, clazz, actions = nil)
+    def initialize(name, class_name, actions = nil)
       @name = name.to_sym
       @actions = actions || [:create, :retrieve, :update, :delete]
-      @clazz = clazz
-      @dirty_sensitive = @clazz.ancestors.include?(Dirty)
+      @class_name = class_name.to_sym
       @dirty = false
       @json_name = Source.json_key_converter.key_to_json(name).to_sym
     end
 
+    def clazz
+      @clazz ||= Arrest::Source.class_loader.load(@class_name)
+    end
+
+    def clazz=(c)
+      @clazz = c
+    end
+
+    def dirty_sensitive?
+      @dirty_sensitive ||= clazz.ancestors.include?(Dirty)
+    end
+
     def read_only?
       @actions == [:retrieve]
     end
@@ -29,7 +40,7 @@ module Arrest
     end
 
     def dirty?
-      if @dirty_sensitive
+      if dirty_sensitive?
         @dirty
       else
         true # treat as 'always' dirty
@@ -39,13 +50,13 @@ module Arrest
     def from_hash(parent, value)
       return if value == nil
 
-      if @clazz.respond_to?(:convert)
-        return @clazz.convert(value)
+      if self.clazz.respond_to?(:convert)
+        return self.clazz.convert(value)
       end
 
-      converter = CONVERTER[@clazz]
+      converter = CONVERTER[self.clazz]
       if converter == nil
-        puts "No converter for: #{@clazz.name}"
+        puts "No converter for: #{self.clazz.name}"
         converter = IdentConv
       end
       converter.convert value
@@ -55,13 +66,13 @@ module Arrest
     def to_hash value
       return nil unless value != nil
 
-      if @clazz.respond_to?(:mk_json)
-        return @clazz.mk_json(value)
+      if self.clazz.respond_to?(:mk_json)
+        return self.clazz.mk_json(value)
       end
 
-      converter = CONVERTER[@clazz]
+      converter = CONVERTER[self.clazz]
       if converter == nil
-        puts "No converter for: #{@clazz.name}"
+        puts "No converter for: #{@self.clazz.name}"
         converter = IdentConv
       end
       converter.mk_json value

data/lib/arrest/attributes/belongs_to.rb

@@ -21,7 +21,7 @@ module Arrest
         if polymorphic
           add_attribute(PolymorphicAttribute.new(field_name.to_sym, actions))
         else
-          add_attribute(BelongsToAttribute.new(field_name.to_sym, actions, String, foreign_key, class_name))
+          add_attribute(BelongsToAttribute.new(field_name.to_sym, actions, :String, foreign_key, class_name))
         end
       end
 
@@ -60,7 +60,7 @@ module Arrest
                 clazz = self.class.json_type_to_class(val.type)
                 id = val.id
               else
-                clazz = Arrest::Source.mod.const_get(class_name)
+                clazz = Arrest::Source.class_loader.load(class_name)
                 id = val
               end
               clazz.find(self.context, id)

data/lib/arrest/attributes/belongs_to_attribute.rb

@@ -1,13 +1,15 @@
 module Arrest
   class BelongsToAttribute < Attribute
     attr_accessor :foreign_key
-    def initialize(name, actions, field_class, foreign_key, target_class_name)
-      super(name, field_class, actions)
+
+    def initialize(name, actions, field_class_name, foreign_key, target_class_name)
+      super(name, field_class_name, actions)
       @foreign_key = foreign_key
       @target_class_name = target_class_name
     end
+
     def target_class
-      @target_class ||= Arrest::Source.mod.const_get(@target_class_name)
+      @target_class ||= Arrest::Source.class_loader.load(@target_class_name)
     end
   end
 end

data/lib/arrest/attributes/has_attributes.rb

@@ -82,6 +82,7 @@ module Arrest
     def attributes=(attribute_hash = {})
       fields = self.class.all_fields
       field_names = fields.map(&:name)
+
       attribute_hash.each_pair do |k, v|
         matching_fields = fields.find_all{|f| f.name.to_s == k.to_s}
         field = matching_fields.first
@@ -142,13 +143,13 @@ module Arrest
         @fields = []
       end
 
-      def attribute(name, clazz, attribs = {})
+      def attribute(name, class_name, attribs = {})
         if !!attribs[:read_only] && !attribs[:actions]
           actions = [:retrieve]
         else
           actions = attribs[:actions]
         end
-        add_attribute Attribute.new(name, clazz, actions)
+        add_attribute Attribute.new(name, class_name, actions)
       end
 
       def attributes(args)
@@ -182,12 +183,12 @@ module Arrest
           self.ancestors.select{|a| a.include?(HasAttributes)}.map(&:fields).flatten.reject{|f| f == nil}
       end
 
-      def nested name, clazz, options = {}
-        add_attribute NestedAttribute.new(name, clazz, options[:actions])
+      def nested name, class_name, options = {}
+        add_attribute NestedAttribute.new(name, class_name, options[:actions])
       end
 
-      def nested_array name, clazz, options = {}
-        add_attribute Arrest::NestedCollection.new(name, clazz, options[:actions])
+      def nested_array name, class_name, options = {}
+        add_attribute Arrest::NestedCollection.new(name, class_name, options[:actions])
       end
     end
 

data/lib/arrest/attributes/nested_attribute.rb

@@ -1,12 +1,13 @@
 module Arrest
-    class NestedAttribute < Attribute
-    def initialize name, clazz, options
-      super name, clazz, options
+  class NestedAttribute < Attribute
+
+    def initialize name, class_name, options
+      super name, class_name, options
     end
 
     def from_hash(parent, value)
       return nil unless value != nil
-      @clazz.new(parent, value)
+      self.clazz.new(parent, value)
     end
 
     def to_hash val

data/lib/arrest/attributes/nested_collection.rb

@@ -1,15 +1,15 @@
 module Arrest
 
   class NestedCollection < Attribute
-    def initialize name, clazz, options
-      super name, clazz, options
+    def initialize name, class_name, options
+      super name, class_name, options
     end
 
     def from_hash(parent, value)
       return nil unless value != nil
       raise "Expected an array but got #{value.class.name}" unless value.is_a?(Array)
       value.map do |v|
-        @clazz.new(parent.context, v)
+        self.clazz.new(parent.context, v)
       end
     end
 

data/lib/arrest/attributes/polymorphic_attribute.rb

@@ -2,8 +2,8 @@ module Arrest
   class Ref
     include HasAttributes
 
-    attribute :id, String
-    attribute :type, String
+    attribute :id,   :String
+    attribute :type, :String
 
     def self.mk_json(value)
       self.to_hash.to_json
@@ -15,13 +15,14 @@ module Arrest
   end
 
   class PolymorphicAttribute < NestedAttribute
+
     def initialize name, actions
-      super name, Ref, actions
+      super name, :'Ref', actions
     end
 
     def from_hash(parent, value)
       return nil unless value != nil
-      @clazz.new(value)
+      self.clazz.new(value)
     end
   end
 end

data/lib/arrest/default_class_loader.rb

@@ -0,0 +1,40 @@
+module Arrest
+
+  ##
+  # Classloader that specifies the deferred class loading strategy for the user. It is registered as default class loader
+  # in the Arrest::Source.
+  # The default implementation tries to load the class specified by the given symbol parameter in the following order:
+  # 1) from the given module utilising Arrest (in our case SGDB)
+  # 2) from Arrest itself (e.g. :Ref)
+  # 3) from the Kernel (for all basic types - String, Integer etc)
+  class DefaultClassLoader
+
+    def load(sym)
+      # Using const_get is effectively a hack - it uses the fact that class names are also constants to allow you to get hold of them.
+      # Better use eval if possible
+
+      clazz =
+        begin
+          eval("#{Source.mod.to_s}::#{sym}") unless Source.mod == Kernel
+        rescue NameError
+        end
+
+
+      clazz ||=
+        begin
+          eval("Arrest::#{sym}")
+        rescue NameError
+        end
+
+      clazz ||=
+        begin
+          Kernel.const_get(sym)
+        rescue NameError
+        end
+
+      raise "Class #{sym} could not be loaded! Tried module if given, with fallback Arrest and Kernel" unless clazz
+      clazz
+    end
+  end
+
+end

data/lib/arrest/helper/has_view.rb

@@ -22,7 +22,7 @@ module Arrest
             r = self.class.source().get(self.context, "#{self.resource_path}/#{id}/#{method_name}")
             r = self.class.body_root(r)
 
-            Arrest::Source.mod.const_get(clazz).new(self.context, r)
+            Arrest::Source.class_loader.load.new(self.context, r)
           end
         end
       end

data/lib/arrest/helper/ordered_collection.rb

@@ -155,7 +155,7 @@ module Arrest
     end
 
     def resolved_class
-      @clazz ||= Source.mod.const_get(@clazz_name)
+      @clazz ||= Source.class_loader.load(@clazz_name)
     end
 
     def define_filters

data/lib/arrest/transport/source.rb

@@ -12,6 +12,7 @@ module Arrest
       attr_reader :source
       attr_reader :mod
       attr_reader :header_decorator
+      attr_accessor :class_loader
       attr_accessor :json_key_converter
       attr_accessor :skip_validations
       attr_accessor :error_handler
@@ -38,6 +39,12 @@ module Arrest
         end
       end
 
+
+      def load_class_from_symbol(sym)
+        self.class_loader.load(sym)
+      end
+
+
       def header_decorator=(hd=nil)
         Arrest::debug "Setting headerd to #{hd}"
         if hd == nil
@@ -50,7 +57,9 @@ module Arrest
       end
     end
   end
+
   Source.mod = nil
+  Source.class_loader = DefaultClassLoader.new
   Source.header_decorator = Handlers::HeaderDecorator
   Source.debug = false
   Source.json_key_converter = Handlers::IdentityJSONKeyConverter

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.89"
+  VERSION = "0.0.90"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.89
+  version: 0.0.90
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000Z
+date: 2012-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10475620 !ruby/object:Gem::Requirement
+  requirement: &16628380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10475620
+  version_requirements: *16628380
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &10473340 !ruby/object:Gem::Requirement
+  requirement: &16627880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *10473340
+  version_requirements: *16627880
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &10472360 !ruby/object:Gem::Requirement
+  requirement: &16627380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *10472360
+  version_requirements: *16627380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10471280 !ruby/object:Gem::Requirement
+  requirement: &16626920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10471280
+  version_requirements: *16626920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10470600 !ruby/object:Gem::Requirement
+  requirement: &16626540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10470600
+  version_requirements: *16626540
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &10469500 !ruby/object:Gem::Requirement
+  requirement: &16626080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10469500
+  version_requirements: *16626080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10468060 !ruby/object:Gem::Requirement
+  requirement: &16625580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *10468060
+  version_requirements: *16625580
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &10467000 !ruby/object:Gem::Requirement
+  requirement: &16625160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10467000
+  version_requirements: *16625160
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &10465960 !ruby/object:Gem::Requirement
+  requirement: &16624700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10465960
+  version_requirements: *16624700
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &10454880 !ruby/object:Gem::Requirement
+  requirement: &16645840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10454880
+  version_requirements: *16645840
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -144,6 +144,7 @@ files:
 - lib/arrest/attributes/nested_attribute.rb
 - lib/arrest/attributes/nested_collection.rb
 - lib/arrest/attributes/polymorphic_attribute.rb
+- lib/arrest/default_class_loader.rb
 - lib/arrest/exceptions.rb
 - lib/arrest/handler.rb
 - lib/arrest/helper/filter.rb