jsus 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,4 +1,7 @@
 = Jsus Changelog
+== Version 0.2.2
+* Fixed dupes in structure json files
+
 == Version 0.2.1
 * Started adding cucumber features for command-line utility. Look into /features
   directory for reference

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/jsus.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]

data/lib/jsus/package.rb

@@ -81,7 +81,7 @@ module Jsus
     end
 
     # Returns an array of provided tags names including those provided by linked external dependencies.
-    def provides_names
+    def provides_names      
       source_files.map {|s| s.provides_names(:short => true) }.flatten |
       linked_external_dependencies.map {|d| d.provides_names }.flatten
     end
@@ -148,7 +148,8 @@ module Jsus
     # Looks up all the external dependencies in the pool.
     def include_dependencies!
       source_files.each do |source|
-        linked_external_dependencies << pool.lookup_dependencies(source) if pool
+        deps = pool.lookup_dependencies(source).to_a - @source_files.to_a
+        linked_external_dependencies << deps if pool
       end
     end
 

data/lib/jsus/source_file.rb

@@ -239,6 +239,17 @@ module Jsus
     def pool
       @pool
     end
+   
+    def ==(other) # :nodoc:
+      eql?(other)
+    end
+    
+    def eql?(other) # :nodoc:
+      filename == other.filename
+    end
     
+    def hash
+      [self.class, filename].hash
+    end
   end
 end

data/spec/jsus/source_file_spec.rb

@@ -259,4 +259,18 @@ describe Jsus::SourceFile do
       end
     end
   end
+  
+  describe "#==, eql, hash" do
+    it "should return true for source files pointing to the same physical file" do
+      subject.should == described_class.from_file(subject.filename)
+      subject.should eql(described_class.from_file(subject.filename))
+      subject.hash.should == described_class.from_file(subject.filename).hash
+    end
+    
+    it "should return false for source files pointing to different physical files" do
+      subject.should_not == described_class.from_file("spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js")
+      subject.should_not eql(described_class.from_file("spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js"))
+      subject.hash.should_not == described_class.from_file("spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js").hash
+    end    
+  end  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Mark Abramov
@@ -285,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1746975261011115171
+      hash: -1177677951338357144
       segments: 
       - 0
       version: "0"