fedux_org-stdlib 0.0.16 → 0.0.17

data/lib/fedux_org/stdlib/models/class_based_model.rb

@@ -46,25 +46,6 @@ module FeduxOrg
             '.rb'
           end
 
-          def ignore
-            'BORING_STRING_WHICH_SHOULD_NEVER_MATCH'
-          end
-
-          def find_files
-            files = []
-            Find.find(path_to_instances) do |path|
-              next unless File.file? path
-              next if path =~ /^\.\.?/
-              next if path =~ %r{#{ignore}}
-
-              files << path
-            end
-
-            files
-          rescue
-            raise FeduxOrg::Stdlib::Models::Exceptions::NoImplementationsForModelFound, "You might need to create the directory\"#{File.dirname(path_to_instances)}\"."
-          end
-
           def load_from_filesystem
             files = find_files
 

data/lib/fedux_org/stdlib/models/filesystem_based_model.rb

@@ -46,9 +46,28 @@ module FeduxOrg
             raise FeduxOrg::Stdlib::Models::Exceptions::MethodNeedsToBeImplemented, "Please defined the method \"path\" to make the library work."
           end
 
+          def ignore
+            'BORING_STRING_WHICH_SHOULD_NEVER_MATCH'
+          end
+
+          def find_files
+            files = []
+            Find.find(path_to_instances) do |path|
+              next unless File.file? path
+              next if suffix and path !~/#{suffix}/
+              next if path =~ /^\.\.?/
+              next if path =~ %r{#{ignore}}
+
+              files << path
+            end
+
+            files
+          rescue
+            raise FeduxOrg::Stdlib::Models::Exceptions::NoImplementationsForModelFound, "You might need to create the directory\"#{File.dirname(path_to_instances)}\"."
+          end
+
           def path_to_instances
-            local_path = ::File.expand_path("../../#{model_name.pluralize.underscore}", path )
-            return_path = ::File.join(local_path,"*#{suffix}")
+            return_path = ::File.expand_path("../../#{model_name.pluralize.underscore}", path )
 
             FeduxOrg::Stdlib.logger.debug(self) { "Path to instances of model: #{return_path}" }
 

data/lib/fedux_org/stdlib/version.rb

@@ -1,6 +1,6 @@
 #main FeduxOrg
 module FeduxOrg
 module Stdlib
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end
 end

data/spec/models/class_based_model_spec.rb

@@ -300,11 +300,6 @@ describe Models::ClassBasedModel do
     expect( result ).to eq( expect_result )
   end
 
-  it "returns the path to instances" do
-    expected_result= File.join( examples_dir, 'test_class_for_filesystems', '*.rb' )
-    expect( Test123::Models::TestClassForFilesystem.send(:path_to_instances) ).to eq( expected_result )
-  end
-
   it "returns the name for the instance based on the path to the ruby file" do
     expect( Test123::Models::TestClassForFilesystem.send(:name, Test123::Models::TestClassForFilesystem.send( :path ) ) ).to eq( :class_based )
   end

data/spec/models/filesystem_based_model_spec.rb

@@ -24,19 +24,6 @@ describe Models::FilesystemBasedModel do
     end
   end
 
-  it "returns a string of all active filters" do
-    @model.create(:name1)
-    @model.create(:name2)
-    @model.enable :name1
-    @model.enable :name2
-
-    result = @model.all_names_as_string(", ")
-    expect(result).to eq("name1, name2")
-
-    result = @model.all_names_as_string
-    expect(result).to eq("name1, name2")
-  end
-
   it "finds all available filter" do
     @model.init
     filter = @model.find(:hello)
@@ -100,7 +87,51 @@ describe Models::FilesystemBasedModel do
     expect( Test123::Models::TestClassForFilesystem.send(:model_name) ).to eq('TestClassForFilesystem')
   end
 
-  it "returns the library name" do
-    expect( Test123::Models::TestClassForFilesystem.send(:library_name) ).to eq('Test123')
+  context "#library_name" do
+    it "returns the library name" do
+      expect( Test123::Models::TestClassForFilesystem.send(:library_name) ).to eq('Test123')
+    end
+  end
+
+  context "#path_to_instances" do
+    klass = Class.new( FeduxOrg::Stdlib::Models::BaseModel ) do
+      include FeduxOrg::Stdlib::Models::FilesystemBasedModel
+
+      def self.model_name
+        'FindFiles'
+      end
+
+      def self.path
+        File.join( examples_dir, 'models', 'filesystem_based', 'find_files')
+      end
+
+    end
+
+    it "returns the path to the instances" do
+      expect( klass.send(:path_to_instances) ).to eq( File.join( examples_dir, 'models', 'find_files') )
+    end
+  end
+
+  context "#find_files" do
+    klass = Class.new( FeduxOrg::Stdlib::Models::BaseModel ) do
+      include FeduxOrg::Stdlib::Models::FilesystemBasedModel
+
+      def self.path_to_instances
+        File.join( examples_dir, 'models', 'filesystem_based', 'find_files')
+      end
+
+      def self.suffix
+        '.rb'
+      end
+    end
+
+    it "search for available instances in filesystem" do
+      expect( klass.send(:find_files) ).to eq(
+        [
+          "/home/d/work/projects/fedux_org-stdlib/spec/examples/models/filesystem_based/find_files/abc.rb",
+          "/home/d/work/projects/fedux_org-stdlib/spec/examples/models/filesystem_based/find_files/cde.rb",
+        ]
+      )
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,8 @@ files:
 - spec/examples/models/class_based/invalid_3.rb
 - spec/examples/models/class_based/valid_1.rb
 - spec/examples/models/class_based/valid_2.rb
+- spec/examples/models/filesystem_based/find_files/abc.rb
+- spec/examples/models/filesystem_based/find_files/cde.rb
 - spec/models/base_model_spec.rb
 - spec/models/class_based_model_spec.rb
 - spec/models/filesystem_based_model_spec.rb
@@ -160,6 +162,8 @@ test_files:
 - spec/examples/models/class_based/invalid_3.rb
 - spec/examples/models/class_based/valid_1.rb
 - spec/examples/models/class_based/valid_2.rb
+- spec/examples/models/filesystem_based/find_files/abc.rb
+- spec/examples/models/filesystem_based/find_files/cde.rb
 - spec/models/base_model_spec.rb
 - spec/models/class_based_model_spec.rb
 - spec/models/filesystem_based_model_spec.rb