niceid 0.0.4 → 0.1.0

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - ruby-head
+  - ree

data/Rakefile

@@ -1,7 +1,7 @@
-require 'bundler'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-Bundler::GemHelper.install_tasks
-RSpec::Core::RakeTask.new('spec')
+
+RSpec::Core::RakeTask.new
 
 task :default => :test
 task :test =>:spec

data/bin/niceid

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
-
 require 'niceid'
 
 puts NiceId::Id.new

data/lib/niceid.rb

@@ -1,30 +1,31 @@
 module NiceId
   class Id
     VARS_NUM = %w{2 3 4 5 6 7 8 9}
-    VARS_LET = %w{f j k m p s t v w x y z}
+    VARS_LET = %w{f j k m p s t v w x y z e}
     DEFAULT_SIZE = 3
 
     def initialize(how_many = DEFAULT_SIZE)
-      @key = ''
-      @summ = 0
-      how_many.times do
-        a = rand VARS_NUM.size
-        b = rand VARS_LET.size
-        @key<<VARS_NUM[a]+VARS_LET[b]
-      end
-      @key=@key.chop << calc
+      rand_method = [].respond_to?(:sample) ? :sample : :choice
+      @key = [].fill(0, how_many) { [VARS_NUM.send(rand_method),VARS_LET.send(rand_method)] }
+      @key = @key.flatten.join
+      @key = @key.chop + calc(@key)
     end
+
     def to_s
       @key
     end
+
     private
+
     def correct?
-      @key[-1..-1] == calc
+      @key[-1..-1] == calc(@key)
     end
-    def calc
-      @sum = @key.chop.scan(/./).map{|a| VARS_NUM.index(a)||VARS_LET.index(a)||0 }
+
+    def calc(key)
+      @sum = key.chop.scan(/./).map{ |a| VARS_NUM.index(a)||VARS_LET.index(a)||0 }
       VARS_LET.at @sum.inject(:+) % VARS_LET.size
     end
+
   end
 end
 

data/lib/niceid/version.rb

@@ -1,3 +1,3 @@
 module NiceId
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/niceid.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Simple to remember and safe for handwriting, letters and numbers based ID.}
 
   s.add_development_dependency "rspec", "~> 2.3"
-  s.add_development_dependency "backports", ">= 2.0"
+  s.add_development_dependency "rake"
 
   s.executables = "niceid"
   s.files         = `git ls-files`.split("\n")

data/spec/niceid_spec.rb

@@ -1,6 +1,4 @@
-require 'backports'
-require_relative 'spec_helper'
-
+require 'spec_helper'
 
 describe NiceId::Id do
 
@@ -20,8 +18,12 @@ describe NiceId::Id do
     @id.send(:correct?).should be_false
   end
 
+  it "should be uniq" do
+    @id.to_s.should_not eq described_class.new.to_s
+  end
+
   it "should genarate Id with custom size" do
-    described_class.new(7).to_s.length.should eq 7*2
+    described_class.new(7).to_s.length.should eq 7 * 2
   end
 
 end

metadata

@@ -1,51 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: niceid
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Serg Podtynnyi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &69701170 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: backports
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *69701170
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &69700270 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Simple to remember and safe for handwriting, letters and numbers based ID.
-email: 
+  prerelease: false
+  version_requirements: *69700270
+description: Simple to remember and safe for handwriting, letters and numbers based
+  ID.
+email:
 - serg.podtynnyi@gmail.com
-executables: 
+executables:
 - niceid
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Rakefile
 - bin/niceid
@@ -56,30 +55,27 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/shtirlic/niceid
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.3
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Nice ID Generator with checksum check.
 test_files: []
-
+has_rdoc: