fedux_org-stdlib 0.0.14 → 0.0.16

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

@@ -1,6 +1,7 @@
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/object/blank'
 require 'fedux_org/stdlib/models/filesystem_based_model'
+require 'find'
 
 module FeduxOrg
   module Stdlib
@@ -28,15 +29,13 @@ module FeduxOrg
           end
 
           def check_klass( klass , *methods)
-            methods.flatten.each do |m|
-              raise exception_for_model, "A valid \"#{model_name}\"-class needs to respond to \"#{ m }\"." unless klass.new.respond_to? m
-            end
+            raise exception_for_model, "A valid \"#{model_name}\"-class needs to respond to \"#{ methods.flatten.join(", ") }\"." unless methods.flatten.all? { |m| klass.new.respond_to? m }
           end
 
           def build_class_constant(name)
             "#{library_name}::#{model_name.pluralize}::#{name.to_s.camelcase}".constantize
           rescue
-            raise exception_for_model , "The filename needs to be snakecase and needs to be convertible to the action class name: filename in camelcase."
+            raise exception_for_model , "Class \"#{library_name}::#{model_name.pluralize}::#{name.to_s.camelcase}\" cannot be found in file \"#{require_path(name)}\"."
           end
 
           def check_method
@@ -47,8 +46,28 @@ 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 = Dir.glob( path_to_instances )
+            files = find_files
+
             FeduxOrg::Stdlib.logger.debug(self) { "Files found at path \"#{path_to_instances}\": #{ files.join(", ") }" }
 
             raise FeduxOrg::Stdlib::Models::Exceptions::NoImplementationsForModelFound, "You might need to store files at \"#{File.dirname(path_to_instances)}\" to make the library work." if files.blank?

data/lib/fedux_org/stdlib/version.rb

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

data/spec/examples/models/class_based/ignore/valid_1.rb

@@ -0,0 +1,8 @@
+module TestIt
+  module TestClasses
+    class Valid1
+      def req_method
+      end
+    end
+  end
+end

data/spec/examples/models/class_based/invalid_3.rb

@@ -0,0 +1,8 @@
+module TestIt
+  module TestClasses
+    class Valid1
+      def req_method1
+      end
+    end
+  end
+end

data/spec/examples/models/class_based/valid_2.rb

@@ -0,0 +1,10 @@
+module TestIt
+  module TestClasses
+    class Valid2
+      def req_method1
+      end
+      def req_method2
+      end
+    end
+  end
+end

data/spec/models/class_based_model_spec.rb

@@ -98,7 +98,6 @@ describe Models::ClassBasedModel do
     expect(test_class.all.first.name).to eq(:valid_1)
   end
 
-
   it "raises an error if an instance is invalid: name error" do
     test_class = Class.new(Models::BaseModel) do
       include Models::FilesystemBasedModel
@@ -173,41 +172,117 @@ describe Models::ClassBasedModel do
     }.to raise_error FeduxOrg::Stdlib::Models::Exceptions::UnauthorizedUseOfKeyword
   end
 
-  it "raises an error if an import filter is invalid: missing method" do
-    test_class = Class.new(Models::BaseModel) do
-      include Models::FilesystemBasedModel
-      include Models::ClassBasedModel
+  context "#check_method" do
+    it "raises an error if an import filter is invalid: missing method" do
+      test_class = Class.new(Models::BaseModel) do
+        include Models::FilesystemBasedModel
+        include Models::ClassBasedModel
 
-      def initialize(name, klass)
-        super(name)
+        def initialize(name, klass)
+          super(name)
 
-        @klass = klass
-      end
+          @klass = klass
+        end
 
-      def self.model_name
-        "TestClass"
-      end
+        def self.model_name
+          "TestClass"
+        end
 
-      def self.library_name
-        'TestIt'
-      end
+        def self.library_name
+          'TestIt'
+        end
 
-      def self.path_to_instances
-        File.join( examples_dir, 'models', 'class_based', 'invalid_2.rb' )
-      end
+        def self.path_to_instances
+          File.join( examples_dir, 'models', 'class_based', 'invalid_2.rb' )
+        end
 
-      def self.require_path(name)
-        File.join( examples_dir, 'models', 'class_based', 'invalid_2' )
+        def self.require_path(name)
+          File.join( examples_dir, 'models', 'class_based', 'invalid_2' )
+        end
+
+        def self.check_method
+          :req_method
+        end
       end
 
-      def self.check_method
-        :req_method
+      expect {
+        test_class.init
+      }.to raise_error TestIt::Exceptions::InvalidTestClass
+    end
+
+    it "supports multiple methods to check for invalid instance and succeeds if both are avaiable." do
+      test_class = Class.new(Models::BaseModel) do
+        include Models::FilesystemBasedModel
+        include Models::ClassBasedModel
+
+        def initialize(name, klass)
+          super(name)
+
+          @klass = klass
+        end
+
+        def self.model_name
+          "TestClass"
+        end
+
+        def self.library_name
+          'TestIt'
+        end
+
+        def self.path_to_instances
+          File.join( examples_dir, 'models', 'class_based', 'valid_2.rb' )
+        end
+
+        def self.require_path(name)
+          File.join( examples_dir, 'models', 'class_based', 'valid_2' )
+        end
+
+        def self.check_method
+          [ :req_method1, :req_method2 ]
+        end
       end
+
+      expect {
+        test_class.init
+      }.to_not raise_error TestIt::Exceptions::InvalidTestClass
     end
 
-    expect {
-      test_class.init
-    }.to raise_error TestIt::Exceptions::InvalidTestClass
+    it "supports multiple methods to check for invalid instance and fails if one is missing." do
+      test_class = Class.new(Models::BaseModel) do
+        include Models::FilesystemBasedModel
+        include Models::ClassBasedModel
+
+        def initialize(name, klass)
+          super(name)
+
+          @klass = klass
+        end
+
+        def self.model_name
+          "TestClass"
+        end
+
+        def self.library_name
+          'TestIt'
+        end
+
+        def self.path_to_instances
+          File.join( examples_dir, 'models', 'class_based', 'invalid_3.rb' )
+        end
+
+        def self.require_path(name)
+          File.join( examples_dir, 'models', 'class_based', 'invalid_3' )
+        end
+
+        def self.check_method
+          [ :req_method1, :req_method2 ]
+        end
+      end
+
+      expect {
+        test_class.init
+      }.to raise_error TestIt::Exceptions::InvalidTestClass
+    end
   end
 
   it "returns the require path" do
@@ -262,4 +337,45 @@ describe Models::ClassBasedModel do
     }.to raise_error FeduxOrg::Stdlib::Models::Exceptions::NoImplementationsForModelFound
   end
 
+  it "#ignore" do
+    test_class = Class.new(Models::BaseModel) do
+      include Models::FilesystemBasedModel
+      include Models::ClassBasedModel
+
+      def initialize(name, klass)
+        super(name)
+
+        @klass = klass
+      end
+
+      def self.model_name
+        "TestClass"
+      end
+
+      def self.library_name
+        'TestIt'
+      end
+
+      def self.path_to_instances
+        File.join( examples_dir, 'models', 'class_based', 'ignore' )
+      end
+
+      def self.require_path(name)
+        File.join( examples_dir, 'models', 'class_based', 'ignore', 'valid_1.rb' )
+      end
+
+      def self.check_method
+        :req_method
+      end
+
+      def self.ignore
+        'ignored'
+      end
+    end
+
+    test_class.init
+    expect(test_class.all.count).to eq(1)
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedux_org-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,9 +115,13 @@ files:
 - script/console
 - script/terminal
 - spec/examples/models/class_based/forbidden_keyword.rb
+- spec/examples/models/class_based/ignore/ignored.rb
+- spec/examples/models/class_based/ignore/valid_1.rb
 - spec/examples/models/class_based/invalid_1.rb
 - spec/examples/models/class_based/invalid_2.rb
+- 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/models/base_model_spec.rb
 - spec/models/class_based_model_spec.rb
 - spec/models/filesystem_based_model_spec.rb
@@ -149,9 +153,13 @@ specification_version: 3
 summary: collection of use full libraries
 test_files:
 - spec/examples/models/class_based/forbidden_keyword.rb
+- spec/examples/models/class_based/ignore/ignored.rb
+- spec/examples/models/class_based/ignore/valid_1.rb
 - spec/examples/models/class_based/invalid_1.rb
 - spec/examples/models/class_based/invalid_2.rb
+- 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/models/base_model_spec.rb
 - spec/models/class_based_model_spec.rb
 - spec/models/filesystem_based_model_spec.rb