oedipus-dm 0.0.2 → 0.0.3

data/lib/oedipus/data_mapper/default_proc.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+##
+# DataMapper Integration for Oedipus.
+# Copyright © 2012 Chris Corbyn.
+#
+# See LICENSE file for details.
+##
+
+module Oedipus
+  module DataMapper
+    # Default methods for accessing model data.
+    #
+    # Note these classes are not actually procs, for performance reasons.
+    module DefaultProc
+      class Get
+        def initialize(model, attr)
+          @model    = model
+          @attr     = attr
+          @property = model.properties[attr]
+        end
+
+        def call(resource)
+          if @property
+            @property.dump(resource[@attr])
+          else
+            resource.send(@attr)
+          end
+        end
+      end
+
+      class Set
+        def initialize(model, attr)
+          @model    = model
+          @attr     = attr
+          @property = model.properties[attr]
+        end
+
+        def call(resource, value)
+          if @property
+            value = @property.load(value)
+          end
+
+          resource.send("#{@attr}=", value)
+        end
+      end
+    end
+  end
+end

data/lib/oedipus/data_mapper/index.rb

@@ -194,9 +194,7 @@ module Oedipus
         raise ArgumentError, "Argument 1 for #multi_search must be a Hash" unless Hash === searches
 
         raw.multi_search(
-          searches.inject({}) { |o, (k, v)|
-            o.merge!(k => convert_filters(v))
-          }
+          searches.inject({}) { |o, (k, v)| o.merge!(k => convert_filters(v)) }
         ).inject({}) { |o, (k, v)|
           o.merge!(k => build_collection(v))
         }
@@ -221,16 +219,16 @@ module Oedipus
       #   a proc/lambda that accepts a resource and returns the value to set,
       #   for realtime indexes only
       def map(attr, options = {})
-        @mappings[attr] = normalize_mapping(attr, options.dup)
+        @mappings[attr.to_sym] = normalize_mapping(attr, options.dup)
       end
 
       private
 
       def normalize_mapping(attr, options)
         options.tap do
-          prop = options.delete(:with) || attr
-          options[:get] ||= ->(r)    { r.send("#{prop}")     }
-          options[:set] ||= ->(r, v) { r.send("#{prop}=", v) }
+          prop = (options.delete(:with) || attr).to_sym
+          options[:get] ||= DefaultProc::Get.new(model, prop)
+          options[:set] ||= DefaultProc::Set.new(model, prop)
         end
       end
 

data/lib/oedipus/data_mapper/version.rb

@@ -9,6 +9,6 @@
 
 module Oedipus
   module DataMapper
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/oedipus/data_mapper.rb

@@ -13,6 +13,7 @@ require "dm-core"
 require "oedipus/data_mapper/version"
 require "oedipus/data_mapper/conversions"
 require "oedipus/data_mapper/pagination"
+require "oedipus/data_mapper/default_proc"
 require "oedipus/data_mapper/index"
 require "oedipus/data_mapper/collection"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus-dm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oedipus
-  requirement: &13409800 !ruby/object:Gem::Requirement
+  requirement: &18175300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *13409800
+  version_requirements: *18175300
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &13409180 !ruby/object:Gem::Requirement
+  requirement: &18174720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *13409180
+  version_requirements: *18174720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13408800 !ruby/object:Gem::Requirement
+  requirement: &18174320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13408800
+  version_requirements: *18174320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13408340 !ruby/object:Gem::Requirement
+  requirement: &18173760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13408340
+  version_requirements: *18173760
 - !ruby/object:Gem::Dependency
   name: dm-pager
-  requirement: &13407860 !ruby/object:Gem::Requirement
+  requirement: &18173280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13407860
+  version_requirements: *18173280
 description: ! '== DataMapper Integration for Oedipus
 
 
@@ -93,6 +93,7 @@ files:
 - lib/oedipus/data_mapper.rb
 - lib/oedipus/data_mapper/collection.rb
 - lib/oedipus/data_mapper/conversions.rb
+- lib/oedipus/data_mapper/default_proc.rb
 - lib/oedipus/data_mapper/index.rb
 - lib/oedipus/data_mapper/pagination.rb
 - lib/oedipus/data_mapper/version.rb
@@ -116,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2073315662830389544
+      hash: 402637751909853895
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2073315662830389544
+      hash: 402637751909853895
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11