the_country_identity 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b14dd44c9f27fd39380bbd1ff57d02c8fb954f
-  data.tar.gz: 920d6d6cc0e64af82af27d32b9c2f52efecd95ea
+  metadata.gz: 240143087b06b0988f6be0a9f05363daac91b1d4
+  data.tar.gz: 02ac846e8d921b7b2aa3bdacde1bc446615284a7
 SHA512:
-  metadata.gz: 47fdf7eab5691a88c5c968b9982855355aa8f3d4e21e4973c05ec98c502285ea4895a75a02cb703a1b29acf5f4bb21707336122b1ef9d9e027331c6110a88931
-  data.tar.gz: efd61648a9aa32718d75cedd1b120a6a0832a12efd117006801a3b9f0911fa4fddfaa0c9fe78253cbe8b797773892ff0073461bb4cd815481d75432ab521c749
+  metadata.gz: 8335ab858d3e574bca074e4464694789bb9900e987f6a4421c08667b982f734a8a36f2b14aa0d6ec089c6f142c8aa2a887380206c8f6dee1a7a3b749b7428d6c
+  data.tar.gz: 227e8e03d4d0b1e6ae5dd5a0313aae64f90b1dcf0d1fb9ce86f2692ec1b970e53abe4e40a1217092f721fa10394da38b88f6706a900a24de0130cbe8d5a8b052

data/README.md

@@ -1,10 +1,12 @@
 # TheCountryIdentity
 
-[![Build Status](https://travis-ci.org/p1nox/the_country_identity.png?branch=master)](https://travis-ci.org/p1nox/the_country_identity) [![Gem Version](https://badge.fury.io/rb/the_country_identity.png)](http://badge.fury.io/rb/the_country_identity) [![Coverage Status](https://coveralls.io/repos/p1nox/the_country_identity/badge.png)](https://coveralls.io/r/p1nox/the_country_identity)
+[![Gem Version](https://badge.fury.io/rb/the_country_identity.png)](http://badge.fury.io/rb/the_country_identity) [![Build Status](https://travis-ci.org/p1nox/the_country_identity.png?branch=master)](https://travis-ci.org/p1nox/the_country_identity) [![Coverage Status](https://coveralls.io/repos/p1nox/the_country_identity/badge.png)](https://coveralls.io/r/p1nox/the_country_identity)
 
 Introducing __the_country_identity__, a [CIA World Factbook](https://www.cia.gov/library/publications/the-world-factbook/) crawler gem, honoring _[The Bourne Series](http://en.wikipedia.org/wiki/Bourne_Series)_.
 
-The source of information is a [RDF Turtle endpoint](http://wifo5-04.informatik.uni-mannheim.de/factbook/all) served by the [D2R Server for the CIA Factbook](http://wifo5-03.informatik.uni-mannheim.de/factbook/) hosted by the [Research Group Data and Web Science](http://dws.informatik.uni-mannheim.de/en/home/) at the University of Mannheim, Germany.
+The source of information is a [RDF Turtle endpoint](http://wifo5-04.informatik.uni-mannheim.de/factbook/all) served from the [D2R Server for the CIA Factbook](http://wifo5-03.informatik.uni-mannheim.de/factbook/) hosted by the [Research Group Data and Web Science](http://dws.informatik.uni-mannheim.de/en/home/) at the University of Mannheim, Germany. In case you get no information from an existing country try [here](http://wifo5-03.informatik.uni-mannheim.de/factbook/data/venezuela) or [here](http://wifo5-04.informatik.uni-mannheim.de/factbook/all) to see if this server is alive.
+
+__This is experimental software, you can use it on production at your own risk.__
 
 ## Installation
 
@@ -32,7 +34,9 @@ Or install it yourself as:
     > country.get_property('lifeexpectancyatbirth_totalpopulation')
     => "73.28E0"
 
-  You can find all the country property keys [here](http://wifo5-04.informatik.uni-mannheim.de/factbook/page/venezuela).
+  You can find all the country property keys [here](http://wifo5-04.informatik.uni-mannheim.de/factbook/page/venezuela) and a running example on a rails application [here](https://github.com/alphadeville/mil1-api).
+
+  * Note: properties will be lazy returned, so a request to the RDF server will be fired only at the first execution of `get_property` method.
 
 ## Roadmap
 

data/lib/the_country_identity/rdf.rb

@@ -6,46 +6,38 @@ module TheCountryIdentity
     @@URI_PREFIX       = 'http://wifo5-03.informatik.uni-mannheim.de/factbook/data/'
     @@STATEMENT_PREFIX = 'http://wifo5-04.informatik.uni-mannheim.de/factbook/ns#'
 
+    attr_accessor :cache
     attr_reader   :country_name
     attr_reader   :url
-    attr_reader   :repo
-    attr_accessor :data
+    attr_reader   :repository
 
-    def initialize(new_country_name)
-      fetch_country new_country_name
+    def initialize(country_name)
+      @cache = {}
+      @country_name = country_name.downcase.gsub(' ', '_').gsub('usa', 'united_states')
+      @url = @@URI_PREFIX + @country_name
     end
 
     def get_property(property_name)
-      return @data[property_name] if @data[property_name]
-
-      unless @repo.nil?
-        options = { :predicate => ::RDF::URI("#{@@STATEMENT_PREFIX}#{property_name}") }
-        @repo.query(options) do |stmnt|
-          @data[property_name] = stmnt.object.value
+      return @cache[property_name] if @cache[property_name]
+
+      begin
+        unless repo.nil?
+          options = { :predicate => ::RDF::URI("#{@@STATEMENT_PREFIX}#{property_name}") }
+          repo.query(options) do |stmnt|
+            @cache[property_name] = stmnt.object.value
+          end
         end
+      rescue => e
+        puts "Not able to get country information, through exception: #{e}"
       end
 
-      @data[property_name]
-    end
-
-    def fetch_country(country_name)
-      @data = {}
-      unless country_name.nil?
-        @country_name = country_name.downcase.gsub(' ', '_').gsub('usa', 'united_states')
-        @url = @@URI_PREFIX + @country_name
-
-        begin
-          fetch_rdf
-        rescue => e
-          puts "Not able to get country information, through exception: #{e}"
-        end
-      end
+      @cache[property_name]
     end
 
     private
 
-      def fetch_rdf
-        @repo = ::RDF::Repository.load(@url)
+      def repo
+        @repository ||= ::RDF::Repository.load(@url)
       end
 
   end

data/lib/the_country_identity/version.rb

@@ -1,3 +1,3 @@
 module TheCountryIdentity
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/{the_country_identity_spec.rb → the_country_identity_rdf_spec.rb}

@@ -22,13 +22,14 @@ describe TheCountryIdentity do
       expect(@country.url).to eq 'http://wifo5-03.informatik.uni-mannheim.de/factbook/data/operation_treadstone'
     end
 
-    it 'sets correct repo (RDF::Repository)' do
-      expect(@country.repo).to be_nil
+    it 'sets correct repository (RDF::Repository)' do
+      @country.get_property('lifeexpectancyatbirth_totalpopulation')
+      expect(@country.repository).to be_nil
     end
 
-    it 'sets initial value for cached data' do
-      expect(@country.data).to be_instance_of(Hash)
-      expect(@country.data.empty?).to be_truthy
+    it 'sets initial value to be cached' do
+      expect(@country.cache).to be_instance_of(Hash)
+      expect(@country.cache.empty?).to be_truthy
     end
 
     it 'returns nil value for a given property' do
@@ -58,19 +59,20 @@ describe TheCountryIdentity do
       expect(@country.url).to eq 'http://wifo5-03.informatik.uni-mannheim.de/factbook/data/venezuela'
     end
 
-    it 'sets correct repo (RDF::Repository)' do
-      expect(@country.repo).to be_instance_of(::RDF::Repository)
-      expect(@country.repo.readable?).to be_truthy
-      expect(@country.repo.writable?).to be_truthy
-      expect(@country.repo.persistent?).to be_falsey
-      expect(@country.repo.transient?).to be_truthy
-      expect(@country.repo.empty?).to be_falsey
-      expect(@country.repo.count).to be 197
+    it 'sets correct repository (RDF::Repository)' do
+      @country.get_property('lifeexpectancyatbirth_totalpopulation')
+      expect(@country.repository).to be_instance_of(::RDF::Repository)
+      expect(@country.repository.readable?).to be_truthy
+      expect(@country.repository.writable?).to be_truthy
+      expect(@country.repository.persistent?).to be_falsey
+      expect(@country.repository.transient?).to be_truthy
+      expect(@country.repository.empty?).to be_falsey
+      expect(@country.repository.count).to be 197
     end
 
-    it 'sets initial value for cached data' do
-      expect(@country.data).to be_instance_of(Hash)
-      expect(@country.data.empty?).to be_truthy
+    it 'sets initial value to be cached' do
+      expect(@country.cache).to be_instance_of(Hash)
+      expect(@country.cache.empty?).to be_truthy
     end
 
     it 'returns a custom value for a given property' do
@@ -78,14 +80,14 @@ describe TheCountryIdentity do
       life_expectancy = @country.get_property(property)
       expect(life_expectancy).to be_instance_of(String)
       expect(life_expectancy).to eq '73.28E0'
-      expect(@country.data[property]).to eq '73.28E0'
+      expect(@country.cache[property]).to eq '73.28E0'
     end
 
     it 'returns nil value for a given unknown property' do
       property = 'operation_blackbriar'
       life_expectancy = @country.get_property(property)
       expect(life_expectancy).to be_nil
-      expect(@country.data[property]).to be_nil
+      expect(@country.cache[property]).to be_nil
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_country_identity
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Raul Pino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -183,7 +183,7 @@ files:
 - lib/the_country_identity/rdf.rb
 - lib/the_country_identity/version.rb
 - spec/spec_helper.rb
-- spec/the_country_identity_spec.rb
+- spec/the_country_identity_rdf_spec.rb
 - the_country_identity.gemspec
 homepage: https://github.com/p1nox/the_country_identity
 licenses:
@@ -211,4 +211,4 @@ specification_version: 4
 summary: Fetch data from CIA World Factbook
 test_files:
 - spec/spec_helper.rb
-- spec/the_country_identity_spec.rb
+- spec/the_country_identity_rdf_spec.rb