freebase-api 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b7e8a2c6fe8238795c80a201f277020c42ea8ea
-  data.tar.gz: e627b3686db5e0db9f374b9130f720e3ae5e2aed
+  metadata.gz: 097e43bda28de6d2a47a68371b45b8982aaa0aa6
+  data.tar.gz: 50efef5ff00a462c924538242c5b47507bb0238f
 SHA512:
-  metadata.gz: a8074d7dc7be46e31da0c6bff00e6f021dbf1fd477a2d2a00130277e30f96cec052b70aa07056a7625eb71f2817ce10f5bb5b1b703b4c24aa4f83f14de2f84dc
-  data.tar.gz: d989451faf085ac0cf720e1d5c666115b785912ab05641a6fb237d4337efabdc647b95f60dcf2a48db69c331ce1a236eeea9cec6dadd003fe45fbcb05c4eca5c
+  metadata.gz: d54082df7c8343c22cc3ffc840ea6d24cde478c8c03711b3dc619d7c94ccd945592cb91104e6f87a54bf2eed7d6b66cf57c48bff8ce01a9a4ddb7ab74de1f8cc
+  data.tar.gz: 5f3e0f3ca84ab1a35ac6d0d5fae3bee10badc63c4010636a9f62469e80d1ad17047f9d65fcc95b1717dd5ec671304fb8f113b939c9eb0efcdcbe2fb5131bb76e

data/lib/freebase_api/topic.rb

@@ -40,30 +40,67 @@ module FreebaseAPI
           "id" => topic['mid'],
           "lang" => lang,
           "property" => {
-            "/type/object/name" => {
-              "valuetype" => "string",
-              "values" => [
-                {
-                 "text" => "#{topic['name']}",
-                 "lang" => lang,
-                 "value" => "#{topic['name']}"
-                }
-              ]
-            }
+            "/type/object/name" => build_simple_property_data("string", [{"text" => topic['name'], "lang" => lang}])
           }
         }
-        data["property"]["/common/topic/notable_for"] = {
-          "valuetype" => "object",
-          "values" => [
-            {
-             "text" => topic['notable']['name'],
-             "lang" => lang,
-             "id" => topic['notable']['id']
-            }
-          ],
-        } if topic.has_key?('notable')
+        if topic.has_key?('notable')
+          data["property"]["/common/topic/notable_for"] = build_simple_property_data("object",
+            [{
+              "text" => topic['notable']['name'],
+              "lang" => lang,
+              "id" => topic['notable']['id']
+            }])
+        end
+        merge_custom_output(topic['output'], data["property"], lang) if topic.has_key?('output')
         data
       end
+
+      # @private
+      def build_simple_property_data(type, values)
+        values_f = values.map do |v|
+          hash = { "lang" => v["lang"], "text" => v["text"].to_s }
+          if v.has_key?("id")
+            hash["id"] = v["id"]
+          else
+            hash["value"] = v["text"]
+          end
+          hash
+        end
+        {
+          "valuetype" => type,
+          "values" => values_f
+        }
+      end
+
+      # @private
+      def merge_custom_output(output, properties, lang)
+        values = nil
+        valuetype = nil
+        output.each do |_, hash|
+          hash.each do |property, values|
+            if values.first.is_a?(Hash)
+              values = values.map do |value|
+                {
+                 "text" => value['name'],
+                 "lang" => lang,
+                 "id" => value['mid']
+                }
+              end
+              valuetype = "object"
+            else
+              values = values.map do |value|
+                {
+                 "text" => "#{value}",
+                 "lang" => lang,
+                 "value" => "#{value}"
+                }
+              end
+              valuetype = "string"
+            end
+            properties[property] = build_simple_property_data(valuetype, values)
+          end
+        end
+      end
     end
 
     def initialize(id, options={})

data/lib/freebase_api/version.rb

@@ -1,3 +1,3 @@
 module FreebaseAPI
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/fixtures/search.json

@@ -60,155 +60,5 @@
     },
     "lang": "en",
     "score": 27.369299
-  },
-  {
-    "mid": "/m/02p7m2",
-    "id": "/en/dylan_moran",
-    "name": "Dylan Moran",
-    "notable": {
-      "name": "Stand-up comedian",
-      "id": "/m/04tkfj6"
-    },
-    "lang": "en",
-    "score": 27.203932
-  },
-  {
-    "mid": "/m/0d0w6b",
-    "id": "/en/dylan_postl",
-    "name": "Hornswoggle",
-    "notable": {
-      "name": "Wrestler",
-      "id": "/m/02nx2gc"
-    },
-    "lang": "en",
-    "score": 26.060364
-  },
-  {
-    "mid": "/m/0219gl",
-    "id": "/en/eric_harris_and_dylan_klebold",
-    "name": "Eric Harris and Dylan Klebold",
-    "lang": "en",
-    "score": 25.414064
-  },
-  {
-    "mid": "/m/07g7jw",
-    "id": "/en/dylan_walsh",
-    "name": "Dylan Walsh",
-    "notable": {
-      "name": "Actor",
-      "id": "/m/02hrh1q"
-    },
-    "lang": "en",
-    "score": 24.362093
-  },
-  {
-    "mid": "/m/03dqyd",
-    "id": "/en/dylan_dog",
-    "name": "Dylan Dog",
-    "notable": {
-      "name": "Fictional Character",
-      "id": "/fictional_universe/fictional_character"
-    },
-    "lang": "en",
-    "score": 23.879669
-  },
-  {
-    "mid": "/m/07nx9j",
-    "id": "/en/dylan_baker",
-    "name": "Dylan Baker",
-    "notable": {
-      "name": "Actor",
-      "id": "/m/02hrh1q"
-    },
-    "lang": "en",
-    "score": 22.494648
-  },
-  {
-    "mid": "/m/0dtb_z3",
-    "id": "/authority/musicbrainz/dd48dca0-74b5-33e0-8a3b-7b5af62a2203",
-    "name": "Dylan",
-    "notable": {
-      "name": "Musical Album",
-      "id": "/music/album"
-    },
-    "lang": "en",
-    "score": 22.073868
-  },
-  {
-    "mid": "/m/05q546",
-    "id": "/en/dylan_ratigan",
-    "name": "Dylan Ratigan",
-    "notable": {
-      "name": "TV Personality",
-      "id": "/tv/tv_personality"
-    },
-    "lang": "en",
-    "score": 21.934017
-  },
-  {
-    "mid": "/m/0lqsy",
-    "id": "/en/full_house",
-    "name": "Full House",
-    "notable": {
-      "name": "TV Program",
-      "id": "/tv/tv_program"
-    },
-    "lang": "en",
-    "score": 21.582886
-  },
-  {
-    "mid": "/m/0gw_yr3",
-    "id": "/authority/imdb/name/nm3729721",
-    "name": "Dylan O'Brien",
-    "notable": {
-      "name": "Actor",
-      "id": "/m/02hrh1q"
-    },
-    "lang": "en",
-    "score": 21.544655
-  },
-  {
-    "mid": "/m/0b2p4m",
-    "id": "/en/dylan_bruno",
-    "name": "Dylan Bruno",
-    "notable": {
-      "name": "Actor",
-      "id": "/m/02hrh1q"
-    },
-    "lang": "en",
-    "score": 21.431660
-  },
-  {
-    "mid": "/m/08c8zn",
-    "id": "/en/sara_dylan",
-    "name": "Sara Dylan",
-    "notable": {
-      "name": "Model",
-      "id": "/m/0d1pc"
-    },
-    "lang": "en",
-    "score": 20.911421
-  },
-  {
-    "mid": "/m/027p9zq",
-    "id": "/en/brad_benton",
-    "name": "Dylan Vox",
-    "notable": {
-      "name": "Actor",
-      "id": "/m/02hrh1q"
-    },
-    "lang": "en",
-    "score": 20.779615
-  },
-  {
-    "mid": "/m/01wk7ld",
-    "id": "/en/dizzee_rascal",
-    "name": "Dizzee Rascal",
-    "notable": {
-      "name": "Rapper",
-      "id": "/m/0hpcdn2"
-    },
-    "lang": "en",
-    "score": 20.738529
   }
 ]

data/spec/fixtures/search_with_output.json

@@ -0,0 +1,56 @@
+[
+  {
+    "mid": "/m/01vrncs",
+    "id": "/en/bob_dylan",
+    "name": "Bob Dylan",
+    "notable": {
+      "name": "Folk rock Artist",
+      "id": "/m/016jny"
+    },
+    "lang": "en",
+    "score": 82.743378,
+    "output": {
+      "description": {
+        "/common/topic/description": [
+          "Bob Dylan is an American singer-songwriter, artist, and writer. He has been an influential figure in popular music and culture for more than five decades. Much of his most celebrated work dates from the 1960s, when he was both a chronicler and a reluctant figurehead of social unrest. A number of Dylan's early songs, such as \"Blowin' in the Wind\" and \"The Times They Are a-Changin'\", became anthems for the American civil rights and anti-war movements. Leaving behind his initial base in the culture of the folk music revival, Dylan's six-minute single \"Like a Rolling Stone\" radically altered the parameters of popular music in 1965. His mid-1960s recordings, backed by rock musicians, reached the top end of the United States music charts while also attracting denunciation and criticism from others in the folk movement.\nDylan's lyrics have incorporated a variety of political, social, philosophical, and literary influences. They defied existing pop music conventions and appealed hugely to the then burgeoning counterculture."
+        ]
+      }
+    }
+  },
+  {
+    "mid": "/m/04prwq",
+    "id": "/en/dylan_and_cole_sprouse",
+    "name": "Dylan and Cole Sprouse",
+    "notable": {
+      "name": "Singer",
+      "id": "/m/0290ngj"
+    },
+    "lang": "en",
+    "score": 39.279640,
+    "output": {
+      "description": {
+        "/common/topic/description": [
+          "Dylan Thomas Sprouse and Cole Mitchell Sprouse are American actors. They are twins and are collectively referred to as Dylan and Cole Sprouse or the Sprouse brothers, usually abbreviated as Sprouse Bros. Their first major theatrical film role was in Big Daddy, where they starred alongside Adam Sandler. They later appeared in several television sitcoms and starred in the straight-to-DVD films, I Saw Mommy Kissing Santa Claus and Just for Kicks.\nIn 2005, they starred in the Disney Channel sitcom The Suite Life of Zack & Cody. As a result of the series' success, the media has termed them \"heartthrobs\" and \"overwhelming draws\" among preteen and teen audiences. The following year, the brothers launched a franchise known as the Sprouse Bros brand, which included a clothing line, book series and magazine. The majority of the Sprouses' franchise ended in 2008, except for their clothing line. The Suite Life of Zack & Cody was retooled in 2008 as The Suite Life on Deck, in which the brothers reprised their roles as Zack and Cody. The Suite Life on Deck went on to become the most-watched tween/children's television show in 2008 and 2009. The show ended in May 2011."
+        ]
+      }
+    }
+  },
+  {
+    "mid": "/m/02fkm",
+    "id": "/en/dylan_thomas",
+    "name": "Dylan Thomas",
+    "notable": {
+      "name": "Novelist",
+      "id": "/m/02xhgwq"
+    },
+    "lang": "en",
+    "score": 38.964607,
+    "output": {
+      "description": {
+        "/common/topic/description": [
+          "Dylan Marlais Thomas was a Welsh poet and writer whose works include the poems \"Do not go gentle into that good night\" and \"And death shall have no dominion\", the \"play for voices\", Under Milk Wood, and stories and radio broadcasts such as A Child's Christmas in Wales and Portrait of the Artist as a Young Dog. He became popular in his lifetime and remained so after his premature death in New York. In his later life he acquired a reputation, which he encouraged, as a \"roistering, drunken and doomed poet\".\nThomas was born in Swansea, Wales, in 1914. An undistinguished pupil, he left school at 16, becoming a journalist for a short time. Although many of his works appeared in print while he was still a teenager, it was the publication of \"Light breaks where no sun shines\", in 1934, that caught the attention of the literary world. While living in London, Thomas met Caitlin Macnamara, whom he married in 1937. Their relationship was defined by alcoholism and was mutually destructive. In the early part of his marriage, Thomas and his family lived hand-to-mouth, settling in the Welsh fishing village of Laugharne."
+        ]
+      }
+    }
+  }
+]

data/spec/topic_spec.rb

@@ -55,7 +55,7 @@ describe FreebaseAPI::Topic do
 
     it "should return ordered scores" do
       topic_search.keys.first.should == 72.587578
-      topic_search.keys.last.should == 20.738529
+      topic_search.keys.last.should == 27.369299
     end
 
     it "should return topics" do
@@ -69,6 +69,14 @@ describe FreebaseAPI::Topic do
     it "should store some properties" do
       item.properties.keys.should == ["/type/object/name", "/common/topic/notable_for"]
     end
+
+    context "with output" do
+      let(:data) { load_fixture 'search_with_output' }
+
+      it "should store some properties" do
+        item.properties.keys.should == ["/type/object/name", "/common/topic/notable_for", "/common/topic/description"]
+      end
+    end
   end
 
   describe "#id" do
@@ -163,4 +171,4 @@ describe FreebaseAPI::Topic do
       topic.image.id.should == topic.id
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freebase-api
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -50,6 +50,7 @@ files:
 - spec/attribute_spec.rb
 - spec/fixtures/img.jpg
 - spec/fixtures/search.json
+- spec/fixtures/search_with_output.json
 - spec/fixtures/topic.json
 - spec/freebase_api_spec.rb
 - spec/image_spec.rb
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Provides access to both a raw-access and an abstract-layer to the Freebase
@@ -85,6 +86,7 @@ test_files:
 - spec/attribute_spec.rb
 - spec/fixtures/img.jpg
 - spec/fixtures/search.json
+- spec/fixtures/search_with_output.json
 - spec/fixtures/topic.json
 - spec/freebase_api_spec.rb
 - spec/image_spec.rb