dozuki 0.0.1 → 0.0.3

data/spec/dozuki/xml_spec.rb

@@ -2,28 +2,31 @@ require 'spec_helper'
 
 module Dozuki
   describe XML do
-    
     describe "parse" do
-      let(:string)        {"<lall><some xml='true' /></lall>"}
+
+      let(:args){["xml", :other, :args]}
       let(:nokogiri_node) {mock "nokogiri node"}
       let(:dozuki_xml_node)  {mock "dozuki xml node"}
+
       before(:each) do
         Nokogiri::XML.stub(:parse).and_return(nokogiri_node)
-        XML::Node.stub(:new).and_return(dozuki_xml_node)
+        Node.stub(:new).and_return(dozuki_xml_node)
       end
-      subject{XML.parse(string)}
+
+      subject{XML.parse(*args)}
+
       it "should parse the xml using nokogiri" do
-        Nokogiri::XML.should_receive(:parse).with(string)
+        Nokogiri::XML.should_receive(:parse).with(*args).and_return(nokogiri_node)
         subject
       end
+
       it "should create a new Node with the nokogiri doc" do
-        XML::Node.should_receive(:new).with(nokogiri_node)
+        Node.should_receive(:new).with(nokogiri_node).and_return(dozuki_xml_node)
         subject
       end
-      it "should return the new node" do
-        subject.should == dozuki_xml_node
-      end
+
+      it {should == dozuki_xml_node}
+
     end
-    
   end
-end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dozuki
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors: 
 - James Almond
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 +00:00
+date: 2011-04-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -51,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -64,8 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -77,11 +65,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: A simple way of extracting various elements from an XML document using XPaths
 email: 
 - james@jamesalmond.com
@@ -95,9 +92,10 @@ files:
 - .autotest
 - .gitignore
 - .rspec
+- CI
 - Gemfile
 - Gemfile.lock
-- README.rdoc
+- README.markdown
 - Rakefile
 - dozuki.gemspec
 - features/each_accessor.feature
@@ -105,19 +103,22 @@ files:
 - features/float_accessor.feature
 - features/get_accessor.feature
 - features/int_accessor.feature
+- features/steps/collection_steps.rb
+- features/steps/error_steps.rb
+- features/steps/format_steps.rb
 - features/steps/xml_steps.rb
 - features/string_accessor.feature
 - features/support/env.rb
 - lib/dozuki.rb
+- lib/dozuki/exceptions.rb
+- lib/dozuki/node.rb
+- lib/dozuki/node_collection.rb
+- lib/dozuki/parsers.rb
 - lib/dozuki/version.rb
 - lib/dozuki/xml.rb
-- lib/dozuki/xml/exceptions.rb
-- lib/dozuki/xml/node.rb
-- lib/dozuki/xml/node_collection.rb
-- lib/dozuki/xml/parser.rb
-- spec/dozuki/xml/node_collection_spec.rb
-- spec/dozuki/xml/node_spec.rb
-- spec/dozuki/xml/parser_spec.rb
+- spec/dozuki/node_collection_spec.rb
+- spec/dozuki/node_spec.rb
+- spec/dozuki/parsers_spec.rb
 - spec/dozuki/xml_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -134,21 +135,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: dozuki
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An XPath syntactic sugar wrapper for Nokogiri
@@ -159,11 +156,14 @@ test_files:
 - features/float_accessor.feature
 - features/get_accessor.feature
 - features/int_accessor.feature
+- features/steps/collection_steps.rb
+- features/steps/error_steps.rb
+- features/steps/format_steps.rb
 - features/steps/xml_steps.rb
 - features/string_accessor.feature
 - features/support/env.rb
-- spec/dozuki/xml/node_collection_spec.rb
-- spec/dozuki/xml/node_spec.rb
-- spec/dozuki/xml/parser_spec.rb
+- spec/dozuki/node_collection_spec.rb
+- spec/dozuki/node_spec.rb
+- spec/dozuki/parsers_spec.rb
 - spec/dozuki/xml_spec.rb
 - spec/spec_helper.rb

data/lib/dozuki/xml/exceptions.rb

@@ -1,27 +0,0 @@
-module Dozuki
-  module XML
-    
-    class NotFound < StandardError
-      attr_accessor :xpath, :node
-      
-      def initialize(msg=nil, opts={})
-        super msg
-        self.xpath = opts[:xpath]
-        self.node = opts[:node]
-      end
-      
-    end
-    
-    class InvalidFormat < StandardError
-      attr_accessor :format, :node, :value
-      
-      def initialize(msg=nil, opts={})
-        super msg
-        self.format = opts[:format]
-        self.node = opts[:node]
-        self.value = opts[:value]
-      end  
-    end
-    
-  end
-end

data/lib/dozuki/xml/node.rb

@@ -1,54 +0,0 @@
-module Dozuki
-  module XML
-    class Node
-      attr_accessor :nokogiri_node
-      
-      def initialize(nokogiri_node)
-        self.nokogiri_node = nokogiri_node
-      end
-      
-      def method_missing(method, *args, &blk)
-        nokogiri_node.send(method, *args, &blk)
-      end
-      
-      def respond_to?(method)
-        nokogiri_node.respond_to?(method) ? true : super
-      end
-      
-      def each(xpath, &blk)
-        collection = NodeCollection.new(nokogiri_node.xpath(xpath))
-        block_given? ? collection.as_node(&blk) : collection
-      end
-      
-      def string(xpath)
-        Parser.to_string(get_first_node(xpath))
-      end
-      
-      def int(xpath)
-        Parser.to_int(get_first_node(xpath))
-      end
-      
-      def float(xpath)
-        Parser.to_float(get_first_node(xpath))
-      end
-      
-      def get(xpath)
-        node = Node.new(get_first_node(xpath))
-        yield node if block_given?
-        node
-      end
-      
-      def exists?(xpath)
-        !nokogiri_node.xpath(xpath).empty?
-      end
-      
-      private 
-        def get_first_node(xpath)
-          node = nokogiri_node.xpath(xpath)
-          raise NotFound.new("Node not found", :xpath => xpath, :node => nokogiri_node) if node.empty?
-          node.first
-        end
-        
-    end
-  end
-end

data/lib/dozuki/xml/node_collection.rb

@@ -1,27 +0,0 @@
-module Dozuki
-  module XML
-    class NodeCollection
-      attr_accessor :collection
-      
-      def initialize(collection)
-        self.collection = collection
-      end
-      
-      def as_node(&blk)
-        collection.each{|item| blk.call(Node.new(item))}
-      end
-      
-      def as_string(&blk)
-        collection.each{|item| blk.call(Parser.to_string(item))}
-      end
-      
-      def as_int(&blk)
-        collection.each{|item| blk.call(Parser.to_int(item))}
-      end
-      
-      def as_float(&blk)
-        collection.each{|item| blk.call(Parser.to_float(item))}
-      end
-    end
-  end
-end

data/lib/dozuki/xml/parser.rb

@@ -1,23 +0,0 @@
-module Dozuki
-  module XML
-    module Parser
-    
-      def self.to_string(node)
-        node.text.strip
-      end
-      
-      def self.to_int(node)
-        string = to_string(node)
-        raise InvalidFormat.new("Parsing error", :node => node, :value => string, :format => "int") unless string =~ /^-?[0-9]+$/
-        string.to_i
-      end
-      
-      def self.to_float(node)
-        string = to_string(node)
-        raise InvalidFormat.new("Parsing error", :node => node, :value => string, :format => "float") unless string =~ /^-?[0-9]+(\.[0-9]+)?$/
-        string.to_f
-      end
-      
-    end
-  end
-end

data/spec/dozuki/xml/node_collection_spec.rb

@@ -1,117 +0,0 @@
-require 'spec_helper'
-module Dozuki
-  module XML
-    describe NodeCollection do
-      
-      describe "as_node" do
-        let(:collection){mock "some_nodes"}
-        let(:blk){Proc.new{}}
-        let(:node_collection){NodeCollection.new(collection)}
-        let(:collection_item){mock "collection item"}
-        let(:new_node){mock "new node"}
-        before(:each) do
-          collection.stub(:each).and_yield(collection_item)
-          Node.stub(:new).and_return(new_node)
-        end
-        
-        subject{node_collection.as_node(&blk)}
-        
-        it "should iterate through the collection" do
-          collection.should_receive(:each)
-          subject
-        end
-        it "should create a new Node with the yielded collection item"  do
-          Node.should_receive(:new).with(collection_item)
-          subject
-        end
-        it "should call the bloc with the node" do
-          blk.should_receive(:call).with(new_node)
-          subject
-        end
-      end
-      
-      describe "as_string" do
-        let(:collection){mock "some_nodes"}
-        let(:blk){Proc.new{}}
-        let(:node_collection){NodeCollection.new(collection)}
-        let(:collection_item){mock "collection item"}
-        let(:string){"string"}
-        before(:each) do
-          collection.stub(:each).and_yield(collection_item)
-          Parser.stub(:to_string).and_return(string)
-        end
-        
-        subject{node_collection.as_string(&blk)}
-        
-        it "should iterate through the collection" do
-          collection.should_receive(:each)
-          subject
-        end
-        it "should create a new Node with the yielded collection item"  do
-          Parser.should_receive(:to_string).with(collection_item)
-          subject
-        end
-        it "should call the bloc with the node" do
-          blk.should_receive(:call).with("string")
-          subject
-        end
-      end
-      
-      describe "as_int" do
-        let(:collection){mock "some_nodes"}
-        let(:blk){Proc.new{}}
-        let(:node_collection){NodeCollection.new(collection)}
-        let(:collection_item){mock "collection item"}
-        let(:int){39}
-        before(:each) do
-          collection.stub(:each).and_yield(collection_item)
-          Parser.stub(:to_int).and_return(int)
-        end
-        
-        subject{node_collection.as_int(&blk)}
-        
-        it "should iterate through the collection" do
-          collection.should_receive(:each)
-          subject
-        end
-        it "should create a new Node with the yielded collection item"  do
-          Parser.should_receive(:to_int).with(collection_item)
-          subject
-        end
-        it "should call the bloc with the node" do
-          blk.should_receive(:call).with(int)
-          subject
-        end
-      end
-      
-      describe "as_float" do
-        let(:collection){mock "some_nodes"}
-        let(:blk){Proc.new{}}
-        let(:node_collection){NodeCollection.new(collection)}
-        let(:collection_item){mock "collection item"}
-        let(:float){39.50}
-        before(:each) do
-          collection.stub(:each).and_yield(collection_item)
-          Parser.stub(:to_float).and_return(float)
-        end
-        
-        subject{node_collection.as_float(&blk)}
-        
-        it "should iterate through the collection" do
-          collection.should_receive(:each)
-          subject
-        end
-        it "should create a new Node with the yielded collection item"  do
-          Parser.should_receive(:to_float).with(collection_item)
-          subject
-        end
-        it "should call the bloc with the node" do
-          blk.should_receive(:call).with(float)
-          subject
-        end
-      end
-      
-      
-    end
-  end
-end