slobr 0.1 → 0.2

data/Manifest.txt

@@ -1,6 +1,5 @@
 History.txt
 Manifest.txt
-PostInstall.txt
 README.rdoc
 Rakefile
 lib/slobr.rb

data/Rakefile

@@ -11,16 +11,10 @@ Hoe.plugin :newgem
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'slobr' do
-  self.developer 'FIXME full name', 'FIXME email'
-  self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  self.rubyforge_name       = self.name # TODO this is default value
+  self.developer 'BKrsta', 'bkrsta@bkrsta.co.cc'
+  self.rubyforge_name       = 'slobr'
   # self.extra_deps         = [['activesupport','>= 2.0.2']]
-
 end
 
 require 'newgem/tasks'
 Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# remove_task :default
-# task :default => [:spec, :features]

data/lib/slobr.rb

@@ -1,37 +1,27 @@
 $:.unshift(File.dirname(__FILE__)) unless
 $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-# require "slobr/helperi"
+# require "slobr/helpers"
 
 module Slobr
-  VERSION = "0.1"
-  # extend self
-  BasePath = File.expand_path(File.dirname(__FILE__))
+  VERSION = "0.2"
 
   class Slobr
-
     def initialize(text = nil)
-      @text = text
-      @text ||= $stdin.readlines
-      # @debug = true
+      @text = text || (puts "Text je nil!"; exit)
       @debug = false
 
       @h = {}
-      @dozvoljena_slova = /[A-Za-zćžpšđĆŽPŠĐ]/
+      @regex = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" #+"ćžpšđĆŽPŠĐ"
     end
 
-    def broji_slova(text = @text)
-      text.each { |line|
-        debug "+ LINE: #{line}"
-        line.scan(/./).each { |s|
-          debug " - SLOVO: #{s}"
-          s = s.upcase
-          if @h[s]
-            @h[s] += 1
-          else
-            @h[s] = 1 unless s.grep(@dozvoljena_slova).empty? # samo slova /a-z/
-          end
-        }
+    def broji_slova(t = @text)
+      t.each_char { |s|
+        s = s.upcase
+        if @regex.include? s
+          @h[s]=0 if @h[s].nil?
+          @h[s]+=1
+        end
       }
     end
 
@@ -43,23 +33,13 @@ module Slobr
       @text = text
     end
 
-    # @hash = @hash.keys.sort_by {|s| s.to_s}.map {|key| [key, h[key]] }
-    # @hash = @hash.sort
-    def sort_h(h)
-      Hash.create(
-        h.sort { |l, r| l[1]<=>r[1] }.each { |i, ii| i  },
-        h.sort { |l, r| l[1]<=>r[1] }.each { |i, ii| ii }
-      )
-    end
-    # @hash = Hash.create(@hash.sort.each {|i, ii| i }, @hash.sort.each {|i, ii| ii })
-
     def ispis(put = false)
-      t = "Slovo, Frekv.\n"
-      @h.sort { |l, r| r[1]<=>l[1] }.each { |i,a|
-        t += "  #{i}:     #{a}\n"
+      t = ["Slovo, Frekv."]
+      @h.sort{|l,r| r[1]<=>l[1] }.each { |s,c|
+        t << "  %s:   %i" % [s, c]
       }
-      return t unless put == true
-      putr t
+      return t.join("\n") unless put
+      put t.join("\n")
     end
 
     # a = TextGraph.new({
@@ -68,8 +48,8 @@ module Slobr
     # })
     # puts a
 
-    def debug(*messages)
-      puts messages.map { |m| "== #{m}" } if debug?
+    def debug(txt='')
+      puts '[d] '+txt if debug?
     end
 
     def debug?

data/test/test_slobr.rb

@@ -8,24 +8,14 @@ class TestSlobr < Test::Unit::TestCase
     @s.broji_slova()
   end
 
-  def test_truth
-    assert true
-  end
-
-  def test_case_name
-    # @s.broji_slova
-    assert_equal @s.ispis, <<-EOF
+  def test_prvi
+    assert_equal @s.ispis+"\n", <<-EOF
 Slovo, Frekv.
-  C:     3
-  X:     2
-  A:     2
-  B:     1
+  C:   3
+  X:   2
+  A:   2
+  B:   1
 EOF
   end
 
-def test_case_name
-  @s.text = "aa"
-  assert_equal @s.text, "aa"
-end
-
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: slobr
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - BKrsta
@@ -9,22 +14,44 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 +02:00
+date: 2010-08-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rubyforge
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
-description: ""
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
+        version: 2.6.1
+  type: :development
+  version_requirements: *id002
+description: FIX (describe your package)
 email: 
-- bkrsta@gmail.com
+- bkrsta@bkrsta.co.cc
 executables: []
 
 extensions: []
@@ -32,11 +59,9 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- PostInstall.txt
 files: 
 - History.txt
 - Manifest.txt
-- PostInstall.txt
 - README.rdoc
 - Rakefile
 - lib/slobr.rb
@@ -49,31 +74,37 @@ has_rdoc: true
 homepage: http://github.com/#{github_username}/#{project_name}
 licenses: []
 
-post_install_message: PostInstall.txt
+post_install_message: 
 rdoc_options: 
 - --main
 - README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: slobr
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: ""
+summary: FIX (describe your package)
 test_files: 
 - test/test_helper.rb
 - test/test_slobr.rb

data/PostInstall.txt

@@ -1,7 +0,0 @@
-
-For more information on slobr, see http://slobr.rubyforge.org
-
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
-
-