binder_core 0.1.0 → 0.1.1

data/lib/binder_core/file_context.rb

@@ -20,9 +20,7 @@ module BinderCore
      
     def register_asset( new_asset )
       new_asset.route = @route.dup
-      
       new_asset.base_url = console.defaults( :base_asset_url ) 
-      
       @assets << new_asset
       new_asset
     end

data/lib/binder_core/folder_context.rb

@@ -8,6 +8,7 @@ module BinderCore
       @route    = []
       @assets   = []
       @params   = {}
+      @data     = {}
     end
     
     def raw
@@ -31,9 +32,9 @@ module BinderCore
         end
         
         parsed_file = Scanner.scan file_config
-        if parsed_file.data then add_data_from( parsed_file ) end
+        unless parsed_file.data.nil? then add_data_from( parsed_file ) end
       end
-      @data = expand_single_keys @data unless @data.nil?
+      @data = expand_single_keys @data
       raw
     end
     

data/lib/binder_core/parser.rb

@@ -73,9 +73,11 @@ module BinderCore
     # 
     # On the other hand, assets ARE automatically added to the binder asset bucket when created.
     # 
+    # This returns an empty hash if no data is added from the contents of this folder
+    # 
     def descend(&config)
       config ||= lambda { |c|  }
-      raw = @context.descend &config
+      raw = @context.descend(&config)
       raw[:data]
     end
   end

data/lib/binder_core/parsers/folder_parser.rb

@@ -1,7 +1,8 @@
 module BinderCore
   class FolderParser < BinderCore::Parser
     def parse
-      add descend
+      contence = descend
+      add contence unless contence.empty?
     end
   end
 end

data/lib/binder_core/version.rb

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

data/spec/binder_core/config_spec.rb

@@ -5,6 +5,7 @@ describe BinderCore::Config do
     let(:context)       { BinderCore::FolderContext.new }
     let(:config)        { BinderCore::Config.new context }
     let(:mockcontext)   { double("ContextMock") }
+    let(:parsr)         { Class.new }
     
     it "should set the path of the contexts dir object" do
       config.set_path BINDER_DEFAULT_DIR
@@ -27,8 +28,7 @@ describe BinderCore::Config do
 
     it "should create a definition, add it to the front of the parser list and return it" do
       config.set_parsers []
-      Parsr = Class.new
-      defn = config.add_parser Parsr do |fcnxt|
+      defn = config.add_parser parsr do |fcnxt|
         true
       end
       context.parsers.first.should == defn
@@ -36,8 +36,7 @@ describe BinderCore::Config do
 
     it "should create a definition, add it to the front of the rule list and return it" do
       config.set_rules []
-      Parsr = Class.new
-      defn = config.add_rule Parsr do |fcnxt|
+      defn = config.add_rule parsr do |fcnxt|
         true
       end
       context.rules.first.should == defn

data/spec/binder_core/folder_context_spec.rb

@@ -12,7 +12,7 @@ describe BinderCore::FolderContext do
       it { should respond_to(:console) }
       it { should respond_to(:console=) }
       it { should respond_to(:data) }
-      it { subject.data.should be_nil }
+      it { subject.data.should == {} }
       it { should respond_to(:route) }
       it { subject.route.should == [] }
       it { should respond_to(:params) }
@@ -39,7 +39,7 @@ describe BinderCore::FolderContext do
     let(:file_list) { ["test.txt"] }
     let(:file) { double("FileRefMock", :files => file_list, :path => "some/path", ) }
     let(:console) { double("ConsoleMock", :continue? => true) }
-    let(:file_context) { double("MockFileContext").as_null_object }
+    let(:file_context) { double("MockFileContext", :name => "somename").as_null_object }
     
     before(:each) do
       context.file = file
@@ -76,14 +76,14 @@ describe BinderCore::FolderContext do
       
       BinderCore::Scanner.should_receive(:scan) do |cbl|
         cbl.call config
-        context
+        file_context
       end
       context.parse_files
     end
     
     it "should add data from the returned parsed file context" do
       context.should_receive(:add_data_from).with(file_context)
-      file_context.should_receive(:data).and_return({})
+      file_context.should_receive(:data).and_return({:mock => "value"})
       BinderCore::Scanner.should_receive(:scan).and_return(file_context)
       context.parse_files
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: binder_core
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec