wc 0.94.2 → 0.95.0

data/Rakefile

@@ -13,11 +13,11 @@ begin
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem.add_development_dependency "getoptlong", ">=0"
     gem.add_development_dependency "builder", ">=2.1.2"
-    gem.add_development_dependency "json", ">=1.4.3"
+    gem.add_development_dependency "json_pure", ">=1.4.3"
     
     # gem.add_dependency "getoptlong", ">=0"
-    gem.add_dependency "builder", ">=2.1.2"
-    gem.add_dependency "json", ">=1.4.3"
+    #gem.add_dependency "builder", ">=2.1.2"
+    gem.add_dependency "json_pure", ">=1.4.3"
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.94.2
+0.95.0

data/bin/wc

@@ -54,7 +54,9 @@ else
   hide_list = []
 end
 
-w = Wc.new(ARGV[0], words, hide_list)
+options = {"hide_list" => hide_list, "words"=>words}
+
+w = Wc.new(ARGV[0], options )
 
 
 

data/lib/wc.rb

@@ -1,22 +1,42 @@
 class Wc 
-  attr_reader :filename, :occurrences, :words
+  attr_reader :filename, :occurrences, :words, :no_autorun
   attr_accessor :hide_list
   
-  def initialize(filename, words, hide_list)
+  # def initialize(filename, words, hide_list)
   
-    if ! filename.nil?
-      @filename = filename
-      @occurrences = read
-    else
-      @filename = STDIN
-      @occurrences = feed
-    end
+  #  if ! filename.nil?
+  #    @filename = filename
+  #    @occurrences = read
+  #  else
+  #    @filename = STDIN
+  #    @occurrences = feed
+  #  end
     
-    @hide_list = hide_list
-    @sorted = Array(occurrences).sort { |one, two| -(one[1] <=> two[1]) }
-    @words = words
-  end
+  #  @hide_list = hide_list
+  #  @sorted = Array(occurrences).sort { |one, two| -(one[1] <=> two[1]) }
+  #  @words = words
+  #end
   
+  def initialize(filename=nil, options={})
+    @hide_list = options["hide_list"]
+    @words = options["words"]
+    @no_autorun = options["no_autorun"]
+    
+    if ! @hide_list
+      @hide_list = []
+    end
+    p @no_autorun
+    if ! @no_autorun 
+       if filename
+        @filename = filename
+        @occurrences = _read
+      else
+        @filename =STDIN
+        @occurrences = _feed
+      end
+      @sorted = Array(occurrences).sort { |one, two| -(one[1] <=> two[1]) }
+    end
+  end
   
   def to_text
     if @words == -1
@@ -54,9 +74,39 @@ class Wc
     ret
   end
   
+  def read(filename) 
+    @occurrences = Hash.new { |h, k| h[k] = 0 }
+    File.open(filename, "r") { |f|
+          f.each_line { |line|
+            words = line.split
+            words.each { |w|
+              if ! hide_list.include?(w.downcase)
+                @occurrences[w.downcase] += 1 
+              end
+            }
+          }
+        }
+    @occurrences
+  end
+  
+  def feed(line)
+    @occurrences = Hash.new { |h, k| h[k] = 0 }
+    words = line.split
+    words.each { |w|
+      if ! hide_list.include?(w.downcase)
+        @occurrences[w.downcase] += 1 
+      end
+    }
+    @occurrences
+  end
+  
+  def get()
+    @sorted = Array(occurrences).sort { |one, two| -(one[1] <=> two[1]) }
+  end
+  
   private
   
-  def read() 
+  def _read() 
     occurrences = Hash.new { |h, k| h[k] = 0 }
     File.open(@filename, "r") { |f|
           f.each_line { |line|
@@ -71,7 +121,7 @@ class Wc
     occurrences
   end
   
-  def feed() 
+  def _feed() 
     occurrences = Hash.new { |h, k| h[k] = 0 }
     filename.each_line { |line|
       words = line.split

data/wc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wc}
-  s.version = "0.94.2"
+  s.version = "0.95.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paolo Perego"]
-  s.date = %q{2010-07-09}
+  s.date = %q{2010-07-12}
   s.default_executable = %q{wc}
   s.description = %q{your ruby word counter experience}
   s.email = %q{thesp0nge@gmail.com}
@@ -48,22 +48,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_development_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_development_dependency(%q<json>, [">= 1.4.3"])
-      s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_runtime_dependency(%q<json>, [">= 1.4.3"])
+      s.add_development_dependency(%q<json_pure>, [">= 1.4.3"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 1.4.3"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_dependency(%q<json>, [">= 1.4.3"])
-      s.add_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_dependency(%q<json>, [">= 1.4.3"])
+      s.add_dependency(%q<json_pure>, [">= 1.4.3"])
+      s.add_dependency(%q<json_pure>, [">= 1.4.3"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
-    s.add_dependency(%q<json>, [">= 1.4.3"])
-    s.add_dependency(%q<builder>, [">= 2.1.2"])
-    s.add_dependency(%q<json>, [">= 1.4.3"])
+    s.add_dependency(%q<json_pure>, [">= 1.4.3"])
+    s.add_dependency(%q<json_pure>, [">= 1.4.3"])
   end
 end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 94
-  - 2
-  version: 0.94.2
+  - 95
+  - 0
+  version: 0.95.0
 platform: ruby
 authors: 
 - Paolo Perego
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 +02:00
+date: 2010-07-12 00:00:00 +02:00
 default_executable: wc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,7 +49,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: json_pure
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -65,25 +65,9 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: json_pure
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,7 +79,7 @@ dependencies:
         - 3
         version: 1.4.3
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 description: your ruby word counter experience
 email: thesp0nge@gmail.com
 executables: