parsley-store 0.1.5 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data///

@@ -0,0 +1,42 @@
+require 'redis'
+require 'biodiversity'
+
+
+class ParsleyStore
+  #database numbers for Redis
+  LOCAL = 1
+  SLAVE = 2
+  
+  def initialize(local_db = LOCAL, slave_db = SLAVE, opts)
+    @parser = ScientificNameParser.new
+    @local = Redis.new
+    @local.select(local_db)
+    @canonical_only = !!opts[:canonical_only]
+    # slave replication is not set up yet, so I comment it out
+    # @slave = Redis.new
+    # @slave.select(slave_db)
+  end
+
+  def parse(scientific_name)
+    stored = @local.get(scientific_name)
+    return JSON.parse(stored, :symbolize_names => true) if stored
+
+    begin
+      parsed = @parser.parse(scientific_name)
+    rescue
+      @parser = ScientificNameParser.new
+      parsed = @parser.parse(scientific_name)
+    end
+    
+    if @canonical_only
+      @local.hset scientific_name, 'parsed',  parsed[:scientificName][:parsed]
+      @local.hset scientific_name, 'parser_version', parsed[:scientificName][:parser_version]
+      @local.hset scientific_name, 'canonical', parsed[:scientificName][:canonical]
+      parsed[:scientificName][:canonical]
+    else
+      serialized = parsed.to_json
+      @local.set scientific_name, serialized
+      parsed
+    end
+  end
+end

data/features/parsley-store.feature

@@ -11,3 +11,10 @@ Feature: Cached parsind of Scientific Names
     Given a clean local database
     When I parse a name "Homo sapiens sapiens (Linn.) 1758" two times
     Then second parse should be much faster
+
+  Scenario: "Parsing only canonical names"
+    And a clean local database
+    Given configuration setting "canonical_only", "true"
+    When I parse a name "Homo sapiens sapiens (Linn) 1758" two times
+    Then I get only "canonical, parser_version, parsed" as value keys
+    And second parse should be much faster

data/features/step_definitions/parsley-store_steps.rb

@@ -22,14 +22,16 @@ Given /^a clean local database$/ do
   @conn.flushdb
   @conn.dbsize.should == 0
   @parser = ParsleyStore.new(@local_db, @slave_db)
+  @parse_opts = {}
 end
 
 When /^I parse a name "([^"]*)" two times$/ do |name|
   now = Time.now
-  res = @parser.parse(name)
+  @name = name
+  res = @parser.parse(@name, @parse_opts)
   @delta1 = Time.now - now
   now = Time.now
-  res = @parser.parse(name)
+  res = @parser.parse(@name, @parse_opts)
   @delta2 = Time.now - now
 end
 
@@ -37,4 +39,13 @@ Then /^second parse should be much faster$/ do
   # puts "%s/%s=%s", [@delta1, @delta2, @delta1/@delta2]
   (@delta1/@delta2).should > 10
 end
+ 
+Given /^configuration setting "([^"]*)", "([^"]*)"$/ do |setting, value|
+  @parse_opts.merge!({setting.to_sym => get_value(value)})
+end
 
+Then /^I get only "([^"]*)" as value keys$/ do |keys|
+  keys = keys.split(",").map {|i| i.strip}
+  db_keys = @conn.hkeys(@name)
+  db_keys.sort.should == keys.sort
+end

data/features/support/helper.rb

@@ -0,0 +1,11 @@
+module ParsleyStoreHelpers
+  def get_value(val)
+    return nil if ['nil', 'null'].include? val 
+    return val.to_i if val.to_i.to_s == val
+    return true if val == 'true'
+    return false if val == 'false'
+  end
+end
+
+
+World(ParsleyStoreHelpers)

data/lib/parsley-store.rb

@@ -11,22 +11,50 @@ class ParsleyStore
     @parser = ScientificNameParser.new
     @local = Redis.new
     @local.select(local_db)
-    # slave replication is not set up yet, so I comment it out
-    # @slave = Redis.new
-    # @slave.select(slave_db)
   end
 
-  def parse(scientific_name)
-    stored = @local.get(scientific_name)
-    return JSON.parse(stored, :symbolize_names => true) if stored
+  def parse(scientific_name, opts = {})
+    @canonical_only = !!opts[:canonical_only]
+    @scientific_name = scientific_name
+
+    parsed_data = get_redis_data
+    return parsed_data if parsed_data
+
+    cache_parsed_data(parse_scientific_name)
+  end
+
+  private
+
+  def get_redis_data
+    if @canonical_only
+      stored = @local.hget(@scientific_name, 'canonical')
+      return stored if stored
+    else
+      stored = @local.get(@scientific_name)
+      return JSON.parse(stored, :symbolize_names => true) if stored
+    end
+  end
+
+  def parse_scientific_name
     begin
-      parsed = @parser.parse(scientific_name)
+      @parser.parse(@scientific_name)
     rescue
       @parser = ScientificNameParser.new
-      parsed = @parser.parse(scientific_name)
+      @parser.parse(@scientific_name)
+    end
+  end
+
+  def cache_parsed_data(parsed_data)
+    if @canonical_only
+      @local.hset @scientific_name, 'parsed',  parsed_data[:scientificName][:parsed]
+      @local.hset @scientific_name, 'parser_version', parsed_data[:scientificName][:parser_version]
+      @local.hset @scientific_name, 'canonical', parsed_data[:scientificName][:canonical]
+      parsed_data[:scientificName][:canonical]
+    else
+      serialized = parsed_data.to_json
+      @local.set @scientific_name, serialized
+      parsed_data
     end
-    serialized = parsed.to_json
-    @local.set scientific_name, serialized
-    parsed
   end
+
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parsley-store
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dmitry Mozzherin
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -04:00
+date: 2010-11-05 00:00:00 -04:00
 default_executable: parsley-store
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -53,6 +56,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -66,6 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -87,10 +92,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- \
 - bin/parsley-store
 - features/parsley-store.feature
 - features/step_definitions/parsley-store_steps.rb
 - features/support/env.rb
+- features/support/helper.rb
 - lib/parsley-store.rb
 - spec/parsley-store_spec.rb
 - spec/spec.opts
@@ -109,6 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -117,6 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"