ruby-factual 0.0.1 → 0.0.2

data/README.md

@@ -1,15 +1,17 @@
 ## Sample Usage
->     require 'ruby-factual'
+>     require 'rubygems'
+>     gem 'ruby-factual'
+>     require 'factual'
 >     
->     api = Factual::Api.new(:api_key => '<YOUR_FACTUAL_API_KEY>', :version => 2)
+>     api = Factual::Api.new(:api_key => "<YOUR_FACTUAL_API_KEY>", :version => 2)
 >     
->     table = api.get_table('g9R1u2')
+>     table = api.get_table("g9R1u2")
 >     puts table.name
 >     
->     table.read(:state => 'hawaii').each do |row|
->       fact = row['test_field']
+>     table.read(:two_letter_abbrev => "CA").each do |state_info|
+>       fact = state_info["state"]
 >       puts fact.value
->       if fact.input('the corrected value', :source => 'source', :comment => 'comment')
->         puts 'inputted'
+>       if fact.input("Kalifornia", :source => "source", :comment => "comment")
+>         puts "inputted"
 >       end
 >     end

data/lib/factual.rb

@@ -16,14 +16,15 @@ module Factual
   end
 
   class Table
-    attr_accessor :name, :description, :rating, :source, :creator, :total_row_count, :created_at, :updated_at, :fields
+    attr_accessor :name, :description, :rating, :source, :creator, :total_row_count, :created_at, :updated_at, :fields, :geo_enabled, :downloadable
     def initialize(table_key, adapter)
       @table_key = table_key
       @adapter = adapter
       @schema = adapter.schema(@table_key)
 
-     [:name, :description, :rating, :source, :creator, :total_row_count, :created_at, :updated_at, :fields].each do |attr|
-       self.send("#{attr}=", @schema[attr.to_s]) 
+     [:name, :description, :rating, :source, :creator, :total_row_count, :created_at, :updated_at, :fields, :geo_enabled, :downloadable].each do |attr|
+       key = camelize(attr)
+       self.send("#{attr}=", @schema[key]) 
      end
 
      @fields.each do |f|
@@ -44,6 +45,13 @@ module Factual
         Row.new(@adapter, @table_key, @fields, row_data)
       end
     end
+
+    private
+
+    def camelize(str)
+      s = str.to_s.split("_").collect{ |w| w.capitalize }.join
+      s[0].chr.downcase + s[1..-1]
+    end
   end
 
   class Row
@@ -64,7 +72,7 @@ module Factual
       @facts_hash  = {}
       @fields.each_with_index do |f, idx|
         next if f["isPrimary"]
-        @facts_hash[f["field_ref"]] = Fact.new(@adapter, @table_key, @subject_key, f['id'], row_data[idx+1])
+        @facts_hash[f["field_ref"]] = Fact.new(@adapter, @table_key, @subject_key, f, row_data[idx+1])
       end
     end
 
@@ -79,20 +87,26 @@ module Factual
   end
 
   class Fact
-    attr_accessor :value, :subject_key, :field_id, :adapter
+    attr_accessor :value, :subject_key, :field, :adapter
 
-    def initialize(adapter, table_key, subject_key, field_id, value)
+    def initialize(adapter, table_key, subject_key, field, value)
       @value = value 
       @subject_key = subject_key
       @table_key = table_key
-      @field_id = field_id
+      @field = field
       @adapter = adapter
     end
 
-    def input(value, opts)
+    def field_ref
+      @field["field_ref"]
+    end
+
+    def input(value, opts={})
+      return false if value.nil?
+
       hash = opts.merge({
         :subjectKey => @subject_key,
-        :fieldId => @field_id,
+        :fieldId => @field['id'],
         :value => value
       })
       query_string = hash.to_a.collect{ |k,v| URI.escape(k.to_s) + '=' + URI.escape(v.to_s) }.join('&')
@@ -120,10 +134,15 @@ module Factual
 
     def api_call(url)
       api_url = @base + url
-      curl = Curl::Easy.new(api_url) do |c|
-        c.connect_timeout = CONNECT_TIMEOUT
+
+      begin
+        curl = Curl::Easy.new(api_url) do |c|
+          c.connect_timeout = CONNECT_TIMEOUT
+        end
+        curl.http_get
+      rescue Exception => e
+        raise ApiError.new(e.to_s + " when getting " + api_url)
       end
-      curl.http_get
 
       resp = JSON.parse(curl.body_str)
       raise ApiError.new(resp["error"]) if resp["status"] == "error"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-factual
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Forrest Cao