identitee 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cb24ae4857e7d85789960a9ddaa4878c595378c
-  data.tar.gz: e9d1d745ee288a215cad41b253314a53baceda29
+  metadata.gz: 9da74fd161fc249437c10e388e20164b4276780e
+  data.tar.gz: fd8111133efc9edc77bfa1e7020b41bbf88f8fca
 SHA512:
-  metadata.gz: 17dc8a313f29d6af6c08e17a56bc5ac724d969251cdde10a16f4de9af96bdb5be6f27f3c36d0bd3ebe6f628a2aec59232fdbabff6d3540794e4b902460ced467
-  data.tar.gz: f1cb6f464b16f390eccdc8337913c75d027e967e12d9aa3fe9779a2b89bec4a11508dff765a48c8375e61bcb3f12050dff36cb9595a136380ae8341eb3a9b994
+  metadata.gz: dbcf9d2ab80514b2f87de44ac15b3fb6d6c7c57fa6667141ff40eb4cc798b33520fbaed4f5325e836973f2af79177019fa42a15cfca8bb9dfc286888589751ff
+  data.tar.gz: fb2518c7ec141523bb9df7337398096791ebc486af444bf48a64fecadb656150375f26a91985a74a5ae360f172a36eeaab244f22a9263ec45fd06767de6ced48

data/lib/identitee/empty_loader.rb

@@ -0,0 +1,3 @@
+class EmptyLoader
+  def lazy_load key; end
+end

data/lib/identitee/identifiables.rb

@@ -1,9 +1,16 @@
 require 'identitee/identifiable_not_found'
+require 'identitee/empty_loader'
 
 module Identitee
   class Identifiables
     def initialize 
       @instances = {}
+      @loaders = []
+      @all_loaded = false
+    end
+
+    def add_loader loader
+      loaders << loader
     end
 
     def register key, instance
@@ -12,12 +19,16 @@ module Identitee
 
     def find key, *default_values, &block
       instances.fetch key.to_s do 
-        if block
-          block.call key
-        elsif default_values.length > 0
-          default_values.first
-        else
-          raise ::Identitee::IdentifiableNotFound
+        lazy_load key
+
+        instances.fetch key.to_s do
+          if block
+            block.call key
+          elsif default_values.length > 0
+            default_values.first
+          else
+            raise ::Identitee::IdentifiableNotFound
+          end
         end
       end
     end
@@ -27,11 +38,20 @@ module Identitee
     end
 
     def all
+      load_all unless all_loaded
       instances.values
     end
 
+    def lazy_load key
+      (loaders.detect { |loader| loader.loadable? key } || EmptyLoader.new).lazy_load key
+    end
+
     private 
 
-    attr_reader :instances
+    def load_all  
+      loaders.each { |loader| loader.load_all }
+    end
+
+    attr_reader :instances, :loaders, :all_loaded
   end
 end

data/lib/identitee/identify.rb

@@ -3,40 +3,28 @@ require "identitee/loader"
 
 module Identitee
   module Identify
-    def identify id, *extra_parameters, &block
+    def identify key, *extra_parameters, &block
       instance = new *extra_parameters
       instance.instance_eval &block if block_given?
 
-      identifiables.register id, instance
+      identifiables.register key, instance
       instance
     end
 
-    def find_identifiable candidate_id
-      identifiables.find candidate_id.to_s do
-        ::Identitee::Loader.new(identify_root_directory: identify_root_directory).lazy_load(candidate_id.to_s)
-        identifiables.find candidate_id, "Unknown"
-      end
+    def find_identifiable key, default=new, &block
+      identifiables.find key, default, &block
     end
 
     def find_identifiable_key instance
       identifiables.find_key instance
     end
 
-    def all_identifiables
-      load_all_identifiables
+    def find_all_identifiables
       identifiables.all
     end
 
-    def load_all_identifiables
-      ::Identitee::Loader.new(identify_root_directory: identify_root_directory).load_all
-    end
-
-    def set_identitee_root path_to_template_root
-      @identify_root_directory = path_to_template_root
-    end
-
-    def identify_root_directory
-      @identify_root_directory
+    def add_identifiable_loader loader
+      identifiables.add_loader loader
     end
 
     def identifiables

data/lib/identitee/identify_key.rb

@@ -0,0 +1,7 @@
+module Identitee
+  module IdentifyKey
+    def key
+      self.class.find_identifiable_key self
+    end
+  end
+end

data/lib/identitee/loader.rb

@@ -4,11 +4,13 @@ module Identitee
       @identify_root_directory = options.delete(:identify_root_directory)
     end
 
-    def lazy_load filename
-      full_path = [identify_root_directory, "#{filename}.rb"].compact.join('/')
+    def loadable? filename
+      File.exists? full_path(filename)
+    end
 
-      if File.exists? full_path
-        force_load full_path
+    def lazy_load filename
+      if loadable? filename
+        force_load full_path(filename)
       else
         yield if block_given?
       end
@@ -24,6 +26,10 @@ module Identitee
 
     attr_reader :identify_root_directory
 
+    def full_path filename
+      [identify_root_directory, "#{filename}.rb"].compact.join('/')
+    end
+
     def force_full_load
       @fully_loaded = true
 

data/lib/identitee/version.rb

@@ -1,3 +1,3 @@
 module Identitee
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/identitee.rb

@@ -1,6 +1,7 @@
 require "identitee/version"
 require "identitee/identify"
 require "identitee/default_path_builder"
+require "identitee/identify_key"
 require "identitee/identify/find_alias"
 
 module Identitee
@@ -8,6 +9,7 @@ module Identitee
     base.extend ::Identitee::Identify
     base.extend ::Identitee::Identify::FindAlias unless base.method_defined? :find
 
-    base.set_identitee_root Identitee::DefaultPathBuilder.to_path caller, base
+    identify_root_directory = Identitee::DefaultPathBuilder.to_path caller, base
+    base.add_identifiable_loader ::Identitee::Loader.new(identify_root_directory: identify_root_directory) 
   end
 end

data/spec/acceptance/default_directory_acceptance_spec.rb

@@ -15,12 +15,8 @@ describe "Default the directory to the caller classes directory and the pluraliz
     end
   end
 
-  it "has a identify_root_directory" do
-    DefaultDirectorySetTest.identify_root_directory.should =~ /default_directory_set_tests/
-  end
-
   it "lazy loads identifyables" do
-    test = DefaultDirectorySetTest.find_identifiable :default_directory_test
+    test = DefaultDirectorySetTest.find_identifiable :default_directory_test, nil
     test.should_not be_nil
     test.should be_successful
   end

data/spec/acceptance/force_all_loading_acceptance_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe "Force all Loading" do
   class LoadingAllTest
     include Identitee
-    set_identitee_root File.expand_path("../loading_all_tests/", __FILE__)
+    add_identifiable_loader Identitee::Loader.new(identify_root_directory: File.expand_path("../loading_all_tests/", __FILE__)) 
   end
 
   it "loads all the identifiable before calling all" do
-    identifiables = LoadingAllTest.all_identifiables
+    identifiables = LoadingAllTest.find_all_identifiables
     identifiables.length.should == 2
   end
 end

data/spec/acceptance/lazy_loading_acceptance_spec.rb

@@ -7,7 +7,7 @@ describe "Lazy Loading" do
 
     attr_accessor :successful
 
-    set_identitee_root File.expand_path("../lazy_loading_tests/", __FILE__)
+    add_identifiable_loader Identitee::Loader.new(identify_root_directory: File.expand_path("../loading_all_tests/", __FILE__)) 
 
     def initialize
       @successful = false
@@ -18,10 +18,6 @@ describe "Lazy Loading" do
     end
   end
 
-  it "has a identify_root_directory" do
-    LazyLoadingTest.identify_root_directory.should =~ /lazy_loading_tests/
-  end
-
   it "lazy loads identifyables" do
     test = LazyLoadingTest.find_identifiable :autoload_test
     test.should_not be_nil

data/spec/lib/identitee/identify_key_spec.rb

@@ -0,0 +1,20 @@
+module Identitee
+  describe IdentifyKey do
+
+    class IdentifyKeyExample
+      include Identitee
+      include IdentifyKey
+
+      add_identifiable_loader Identitee::Loader.new(identify_root_directory: File.expand_path("../loading_all_tests/", __FILE__)) 
+    end
+
+    it "should have the key method" do
+      expect(IdentifyKeyExample.new).to respond_to :key
+    end
+
+    it "should return the correct key" do
+      example = IdentifyKeyExample.identify :example_key_test
+      expect(example.key).to eq "example_key_test"
+    end
+  end
+end

data/spec/lib/identitee/identify_spec.rb

@@ -74,7 +74,7 @@ describe Identitee do
     TestNotReplacingFind.send(:include, Identitee)
 
     TestNotReplacingFind.find("something").should == "something"
-    TestNotReplacingFind.find_identifiable("something").should == "Unknown"
+    TestNotReplacingFind.find_identifiable("something", "Unknown").should == "Unknown"
   end
 
   it "finds the key for an identifiable" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: identitee
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Nate Davis Olds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies: []
 description: Identifies and stores instances of a class for later loading
 email:
@@ -30,10 +30,12 @@ files:
 - identitee.gemspec
 - lib/identitee.rb
 - lib/identitee/default_path_builder.rb
+- lib/identitee/empty_loader.rb
 - lib/identitee/identifiable_not_found.rb
 - lib/identitee/identifiables.rb
 - lib/identitee/identify.rb
 - lib/identitee/identify/find_alias.rb
+- lib/identitee/identify_key.rb
 - lib/identitee/loader.rb
 - lib/identitee/version.rb
 - spec/acceptance/alias_find_acceptance_spec.rb
@@ -47,6 +49,7 @@ files:
 - spec/integration/loader_integration_spec.rb
 - spec/integration/test_files/test_lazy_load.rb
 - spec/lib/identitee/identifiables_spec.rb
+- spec/lib/identitee/identify_key_spec.rb
 - spec/lib/identitee/identify_spec.rb
 - spec/lib/identitee/loader_spec.rb
 - spec/spec_helper.rb
@@ -86,6 +89,7 @@ test_files:
 - spec/integration/loader_integration_spec.rb
 - spec/integration/test_files/test_lazy_load.rb
 - spec/lib/identitee/identifiables_spec.rb
+- spec/lib/identitee/identify_key_spec.rb
 - spec/lib/identitee/identify_spec.rb
 - spec/lib/identitee/loader_spec.rb
 - spec/spec_helper.rb