objectify 0.1.0 → 0.1.1

data/lib/objectify/config/context.rb

@@ -86,10 +86,6 @@ module Objectify
         end
       end
 
-      def resolvers
-        @resolvers ||= NamedValueResolverLocator.new(NameTranslationResolver)
-      end
-
       def instantiator
         @instantiator ||= Instantiator.new(injector)
       end

data/lib/objectify/rails/controller.rb

@@ -43,13 +43,8 @@ module Objectify
         end
 
         def objectify_route
-          @objectify_route ||= if params[:objectify]
-            Objectify::Route.new(params[:objectify][:resource].to_sym,
-                                 params[:action].to_sym)
-          else
-            Objectify::Route.new(params[:controller].to_sym,
-                                 params[:action].to_sym)
-          end
+          resource_name = params[:objectify] ? params[:objectify][:resource] : params[:controller]
+          @objectify_route ||= Objectify::Route.new(resource_name.to_sym, params[:action].to_sym)
         end
 
         def action

data/lib/objectify/rails/log_subscriber.rb

@@ -14,11 +14,9 @@ module Objectify
           parameters = event.payload[:parameters].map do |req, param|
             param if req == :req
           end.compact
-          resolvers  = Hash[*parameters.zip(event.payload[:resolvers].map(&:class)).flatten]
           arguments  = event.payload[:arguments].map(&:class).inspect[1..-2]
 
           message = "      [Injector] Invoking #{object}.#{method}(#{arguments}). "
-          message << "Resolutions: #{resolvers}. " if !resolvers.empty?
           message << duration(event)
 
           logger.debug(message)

data/lib/objectify/version.rb

@@ -1,3 +1,3 @@
 module Objectify
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: objectify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70137374227200 !ruby/object:Gem::Requirement
+  requirement: &70203413321160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70137374227200
+  version_requirements: *70203413321160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70137374226220 !ruby/object:Gem::Requirement
+  requirement: &70203413318700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70137374226220
+  version_requirements: *70203413318700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70137374224820 !ruby/object:Gem::Requirement
+  requirement: &70203413317340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70137374224820
+  version_requirements: *70203413317340
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70137374222400 !ruby/object:Gem::Requirement
+  requirement: &70203413316500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70137374222400
+  version_requirements: *70203413316500
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70137374221700 !ruby/object:Gem::Requirement
+  requirement: &70203419213280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70137374221700
+  version_requirements: *70203419213280
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70137378002540 !ruby/object:Gem::Requirement
+  requirement: &70203419212740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70137378002540
+  version_requirements: *70203419212740
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70137378000720 !ruby/object:Gem::Requirement
+  requirement: &70203419212340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137378000720
+  version_requirements: *70203419212340
 description: Objects on rails.
 email:
 - jamesgolick@gmail.com
@@ -111,7 +111,6 @@ files:
 - lib/objectify/injector.rb
 - lib/objectify/instantiator.rb
 - lib/objectify/instrumentation.rb
-- lib/objectify/logging.rb
 - lib/objectify/policy_chain_executor.rb
 - lib/objectify/rails/application.rb
 - lib/objectify/rails/controller.rb
@@ -120,8 +119,6 @@ files:
 - lib/objectify/rails/railtie.rb
 - lib/objectify/rails/renderer.rb
 - lib/objectify/rails/routing.rb
-- lib/objectify/resolver.rb
-- lib/objectify/resolver_locator.rb
 - lib/objectify/route.rb
 - lib/objectify/version.rb
 - objectify.gemspec
@@ -135,8 +132,6 @@ files:
 - spec/policy_chain_executor_spec.rb
 - spec/rails/renderer_spec.rb
 - spec/rails/routing_spec.rb
-- spec/resolver_locator_spec.rb
-- spec/resolver_spec.rb
 - spec/route_spec.rb
 - spec/spec_helper.rb
 - thoughts/injector.md
@@ -175,7 +170,5 @@ test_files:
 - spec/policy_chain_executor_spec.rb
 - spec/rails/renderer_spec.rb
 - spec/rails/routing_spec.rb
-- spec/resolver_locator_spec.rb
-- spec/resolver_spec.rb
 - spec/route_spec.rb
 - spec/spec_helper.rb

data/lib/objectify/logging.rb

@@ -1,22 +0,0 @@
-require "logger"
-
-module Objectify
-  module Logging
-    class << self
-      attr_writer :logger
-
-      def logger
-        @logger ||= Logger.new("/dev/null")
-      end
-    end
-
-    private
-      def logger
-        if Kernel.const_defined?(:Rails)
-          ::Rails.logger
-        else
-          Logging.logger
-        end
-      end
-  end
-end

data/lib/objectify/resolver.rb

@@ -1,27 +0,0 @@
-module Objectify
-  class NamedValueResolver
-    attr_reader :name
-
-    def initialize(name, value)
-      @name  = name
-      @value = value
-    end
-
-    def call
-      @value
-    end
-  end
-
-  class NameTranslationResolver
-    attr_reader :name
-
-    def initialize(name, value)
-      @name  = name
-      @value = value.to_s.classify
-    end
-
-    def call
-      @value.constantize.new
-    end
-  end
-end

data/lib/objectify/resolver_locator.rb

@@ -1,73 +0,0 @@
-require "objectify/resolver"
-
-module Objectify
-  class ArrayResolverLocator
-    def initialize(resolvers)
-      @resolvers = resolvers
-    end
-
-    def call(name)
-      @resolvers.detect { |resolver| resolver.name == name }
-    end
-  end
-
-  class MultiResolverLocator
-    def initialize(locators)
-      @locators = [*locators]
-    end
-
-    def call(name)
-      @locators.each do |locator|
-        resolver = locator.call(name)
-        return resolver if resolver
-      end
-
-      raise ArgumentError, "No resolver found for #{name}."
-    end
-
-    def context(context)
-      @locators.unshift(context)
-    end
-
-    def clear_context
-      @locators.shift
-    end
-  end
-
-  class NamedValueResolverLocator
-    def initialize(resolver_factory = NamedValueResolver)
-      @resolver_factory = resolver_factory
-      @resolvers        = {}
-    end
-
-    def add(name, value)
-      @resolvers[name] = @resolver_factory.new(name, value)
-    end
-
-    def call(name)
-      @resolvers[name]
-    end
-  end
-
-  class ConstResolverLocator
-    def initialize(namespace = nil)
-      @namespace = namespace
-      @cache = {}
-    end
-
-    def call(name)
-      @cache[name] || locate_and_store(name)
-    end
-
-    private
-      def locate_and_store(name)
-        begin
-          const_name = [@namespace, [name, :resolver].join("_")].compact.join("/")
-          const_name.classify.constantize.new.tap do |obj|
-            @cache[name] = obj
-          end
-        rescue NameError
-        end
-      end
-  end
-end

data/spec/resolver_locator_spec.rb

@@ -1,109 +0,0 @@
-require "spec_helper"
-require "objectify/resolver_locator"
-
-describe "Objectify::ArrayResolverLocator" do
-  before do
-    @locator_a = stub("Resolver", :name => :a)
-    @locator_b = stub("Resolver", :name => :b)
-    @resolvers = [@locator_a, @locator_b]
-    @resolver_locator = Objectify::ArrayResolverLocator.new(@resolvers)
-  end
-
-  it "returns locators by name" do
-    @resolver_locator.call(:a).should == @locator_a
-    @resolver_locator.call(:b).should == @locator_b
-  end
-end
-
-describe "Objectify::MultiResolverLocator" do
-  before do
-    @locator_a        = stub("LocatorA", :call => nil)
-    @locator_a.stubs(:call).with(:a).returns(:resolver_a)
-    @locator_b        = stub("LocatorB", :call => nil)
-    @locator_b.stubs(:call).with(:b).returns(:resolver_b)
-
-    @locators         = [@locator_a, @locator_b]
-    @resolver_locator = Objectify::MultiResolverLocator.new(@locators)
-  end
-
-  it "searches through its locators for a resolver" do
-    @resolver_locator.call(:a).should == :resolver_a
-    @resolver_locator.call(:b).should == :resolver_b
-  end
-  
-  it "raises ArgumentError when a resolver can't be found" do
-    not_found = lambda { @resolver_locator.call(:asdf) }
-    not_found.should raise_error(ArgumentError)
-  end
-
-  it "accepts a temporary, contextual locator which takes priority" do
-    @temp_locator = stub("TempLocator", :call => :temp_resolver)
-    @resolver_locator.context(@temp_locator)
-    @resolver_locator.call(:a).should == :temp_resolver
-    @resolver_locator.clear_context
-    @resolver_locator.call(:a).should == :resolver_a
-  end
-end
-
-describe "Objectify::NamedValueResolverLocator" do
-  before do
-    @resolver = stub("Resolver")
-    @factory = stub("ResolverFactory", :new => @resolver)
-    @locator = Objectify::NamedValueResolverLocator.new(@factory)
-  end
-
-  it "#call returns the per-name resolver" do
-    @locator.add(:name, :value)
-    @locator.call(:name).should == @resolver
-  end
-
-  it "#add creates a resolver for the supplied key/value pair" do
-    @locator.add(:name, :value)
-    @factory.should have_received(:new).with(:name, :value)
-  end
-end
-
-class MyResolver; end
-module Something; class MyResolver; end; end
-
-describe "Objectify::ConstResolverLocator" do
-  context "in the global namespace" do
-    before do
-      @locator = Objectify::ConstResolverLocator.new
-    end
-
-    it "finds resolvers by const name" do
-      @locator.call(:my).should be_instance_of(MyResolver)
-    end
-
-    it "returns nil if the const is missing" do
-      @locator.call(:missing).should be_nil
-    end
-
-    it "keeps a cache of instantiated resolvers" do
-      obj1 = @locator.call(:my)
-      obj2 = @locator.call(:my)
-      obj1.object_id.should == obj2.object_id
-    end
-  end
-
-  context "in an arbitrary namespace" do
-    before do
-      @locator = Objectify::ConstResolverLocator.new("something")
-    end
-
-    it "finds resolvers by const name" do
-      @locator.call(:my).should be_instance_of(Something::MyResolver)
-    end
-
-    it "returns nil if the const is missing" do
-      @locator.call(:missing).should be_nil
-    end
-
-    it "keeps a cache of instantiated resolvers" do
-      obj1 = @locator.call(:my)
-      obj2 = @locator.call(:my)
-      obj1.object_id.should == obj2.object_id
-    end
-  end
-end

data/spec/resolver_spec.rb

@@ -1,28 +0,0 @@
-require "spec_helper"
-require "objectify/resolver"
-
-describe "Objectify::NamedValueResolver" do
-  before do
-    @named_value_resolver = Objectify::NamedValueResolver.new(:name, :value)
-  end
-
-  it "returns the supplied name" do
-    @named_value_resolver.name.should == :name
-  end
-
-  it "returns the supplied value" do
-    @named_value_resolver.call.should == :value
-  end
-end
-
-class MyResolver; end
-
-describe "Objectify::NameTranslationResolver" do
-  before do
-    @resolver = Objectify::NameTranslationResolver.new(:a, :my_resolver)
-  end
-
-  it "instantiates resolvers" do
-    @resolver.call.should be_instance_of(MyResolver)
-  end
-end