wikidata-client 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481fea0ff50fb59f774077d355a116e013938acc
-  data.tar.gz: b6c966efa34763559016e69a3fc5a8827631da48
+  metadata.gz: 036b3598b8288484b5aebf973b3ae366126b5162
+  data.tar.gz: 523725c269c4d52fbb0e366cffc44d18aa9e071c
 SHA512:
-  metadata.gz: 7790f67d9bc9ddea9ff9ccb211776e63c49ea70bb9a74a9eba839f56f17b31d291727c99f3277e00be008676a6bd5155b8a63a2dc312dd691a286539ab19dc2d
-  data.tar.gz: af37ed1e5cee7bc64fd7182826ef167d690f99858d01f9ed643942489a8b769846b93fc232663a8b73892f9a424a815882dfb416bcb567ef50146efa24e91869
+  metadata.gz: 013beb7a6398f8b26bd835f2338e51e4c2a2b37895cba4779e8dbfe6ea5a397c6ecaf348f63993f35d1dc9f7bed63839b9e6baf17e6fdb0f0d9eb0873c39060c
+  data.tar.gz: f9ebc57fcfce61f37b6d975030742897fcde8c0e77e0828ec8528f4affde1f762ccdaca202f3f0dc478eab6f5efdfc419af3a8e7060e589096add92d6dbc867c

data/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.0.7
+
+* Added support for commonsMedia images
+
+## 0.0.6
+
+- Various fixes
+
+## 0.0.5
+
+- Various fixes
+
 ## 0.0.4
 
 - HTTP client options more easily configurable

data/README.md

@@ -9,12 +9,13 @@
 
 [Wikidata](http://www.wikidata.org/) client library for Ruby.
 
-It provide an easy way to search for wikidata pages and read their contents.
+It provide an easy way to search for wikidata and wikipedia pages and read
+their contents.
 
 
 ## Installation
 
-In bunler: `gem 'wikidata-client', '~> 0.0.6', require: 'wikidata'`
+In bunler: `gem 'wikidata-client', '~> 0.0.7', require: 'wikidata'`
 
 Otherwise: `gem install wikidata-client`
 

data/lib/wikidata/property/commons_media.rb

@@ -0,0 +1,41 @@
+module Wikidata
+  module Property
+    class CommonsMedia < Wikidata::Property::Base
+      BASE_PAGE_URL = "https://commons.wikimedia.org/wiki/File:%s.%s".freeze
+      IMAGE_URL = "https://upload.wikimedia.org/wikipedia/commons/%s/%s/%s.%s"
+      THUMB_IMAGE_URL = "https://upload.wikimedia.org/wikipedia/commons/thumb/%s/%s/%s.%s/%ipx-%s.%s"
+
+      def page_url
+        @_page_url ||= sprintf BASE_PAGE_URL, basename, extension
+      end
+
+      def url size = nil
+        if size
+          sprintf THUMB_IMAGE_URL, md5[0], md5[0..1], basename, extension, size, basename, extension, thumb_extension
+        else
+          sprintf IMAGE_URL, md5[0], md5[0..1], basename, extension
+        end
+      end
+
+      def md5
+        @_md5 ||= Digest::MD5.hexdigest "#{basename}.#{extension}"
+      end
+
+      def basename
+        @_basename ||= name.gsub ' ', '_'
+      end
+
+      def name
+        @_name ||= File.basename(value, ".#{extension}")
+      end
+
+      def thumb_extension
+        @_thumb_ext ||= extension == 'svg' ? 'svg.png' : extension
+      end
+
+      def extension
+        @_ext ||= File.extname(value).tr '.', ''
+      end
+    end
+  end
+end

data/lib/wikidata/property.rb

@@ -13,6 +13,8 @@ module Wikidata
         Wikidata::Property::Url.new attribute
       when 'wikibase-item'
         Wikidata::Item.find Wikidata::Entity.entity_id(attribute)
+      when 'commonsMedia'
+        Wikidata::Property::CommonsMedia.new attribute
       else
         puts "Unkown property type #{attribute.mainsnak.datatype}"
       end

data/lib/wikidata/version.rb

@@ -1,3 +1,3 @@
 module Wikidata
-  VERSION = "0.0.6".freeze
+  VERSION = "0.0.7".freeze
 end

data/lib/wikidata.rb

@@ -36,6 +36,7 @@ require 'wikidata/property/string'
 require 'wikidata/property/time'
 require 'wikidata/property/url'
 require 'wikidata/property/globe_coordinate'
+require 'wikidata/property/commons_media'
 require 'wikidata/entity'
 require 'wikidata/item'
 require 'wikidata/response'

data/spec/wikidata/property/common_media_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe Wikidata::Property::CommonsMedia do
+  let(:image) {
+    described_class.new(
+      {
+        'id' =>  'Q6882$8CB12994-045E-4EB3-98F8-3975EA1BF9A7',
+        'mainsnak' =>  {
+          'snaktype' =>  'value',
+          'property' =>  'P18',
+          'datatype' =>  'commonsMedia',
+          'datavalue' =>  {
+            'value' =>  'Revolutionary Joyce Better Contrast.jpg',
+            'type' =>  'string'
+          }
+        },
+        'type' =>  'statement',
+        'rank' =>  'normal',
+        'references' =>  [
+          {
+            'hash' =>  'd6e3ab4045fb3f3feea77895bc6b27e663fc878a',
+            'snaks' =>  {
+              'P143' =>  [
+                {
+                  'snaktype' =>  'value',
+                  'property' =>  'P143',
+                  'datatype' =>  'wikibase-item',
+                  'datavalue' =>  {
+                    'value' =>  {
+                      'entity-type' =>  'item',
+                      'numeric-id' =>  206855
+                    },
+                    'type' =>  'wikibase-entityid'
+                  }
+                }
+              ]
+            },
+            'snaks-order' =>  ['P143']
+          }
+        ]
+      }
+    )
+  }
+
+  describe 'image' do
+    it "should return image page url" do
+      image.page_url.should eq "https://commons.wikimedia.org/wiki/File:Revolutionary_Joyce_Better_Contrast.jpg"
+    end
+
+    it "should return image extension" do
+      image.extension.should eq "jpg"
+    end
+
+    it "should return image name" do
+      image.name.should eq "Revolutionary Joyce Better Contrast"
+    end
+
+    it "should return image file base name" do
+      image.basename.should eq "Revolutionary_Joyce_Better_Contrast"
+    end
+
+    it "should return image url" do
+      image.url.should eq "https://upload.wikimedia.org/wikipedia/commons/1/1e/Revolutionary_Joyce_Better_Contrast.jpg"
+    end
+
+    it "should return image url for a given size" do
+      image.url(200).should eq "https://upload.wikimedia.org/wikipedia/commons/thumb/1/1e/Revolutionary_Joyce_Better_Contrast.jpg/200px-Revolutionary_Joyce_Better_Contrast.jpg"
+    end
+  end
+end

data/wikidata-client.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
   s.add_dependency("faraday", "~> 0.9")
   s.add_dependency("faraday_middleware", "~> 0.9")
   s.add_dependency("hashie", "~> 3.3")
-  s.add_development_dependency("excon", "~> 0.40")
+  s.add_dependency("excon", "~> 0.40")
+
   s.add_development_dependency("rspec", "~> 3.1")
   s.add_development_dependency("webmock", "~> 1.18")
   s.add_development_dependency("vcr", "~> 2.9")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wikidata-client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kévin Lacointe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -59,7 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.40'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -142,11 +142,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENCE
 - README.md
 - Rakefile
@@ -159,6 +159,7 @@ files:
 - lib/wikidata/item.rb
 - lib/wikidata/property.rb
 - lib/wikidata/property/base.rb
+- lib/wikidata/property/commons_media.rb
 - lib/wikidata/property/globe_coordinate.rb
 - lib/wikidata/property/string.rb
 - lib/wikidata/property/time.rb
@@ -201,6 +202,7 @@ files:
 - spec/wikidata/client_spec.rb
 - spec/wikidata/entity_spec.rb
 - spec/wikidata/item_spec.rb
+- spec/wikidata/property/common_media_spec.rb
 - spec/wikidata/property/time_spec.rb
 - spec/wikidata_spec.rb
 - wikidata-client.gemspec
@@ -264,5 +266,6 @@ test_files:
 - spec/wikidata/client_spec.rb
 - spec/wikidata/entity_spec.rb
 - spec/wikidata/item_spec.rb
+- spec/wikidata/property/common_media_spec.rb
 - spec/wikidata/property/time_spec.rb
 - spec/wikidata_spec.rb

data/Gemfile.lock

@@ -1,78 +0,0 @@
-PATH
-  remote: .
-  specs:
-    wikidata-client (0.0.6)
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.9)
-      hashie (~> 3.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    codeclimate-test-reporter (0.4.1)
-      simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.0)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    excon (0.40.0)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
-      faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.5-java)
-    hashie (3.4.1)
-    method_source (0.8.2)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry (0.10.1-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rake (10.3.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.4)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.1)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
-    safe_yaml (1.0.4)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.6.0)
-    spoon (0.0.4)
-      ffi
-    vcr (2.9.3)
-    webmock (1.19.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  codeclimate-test-reporter
-  excon (~> 0.40)
-  pry (~> 0.10)
-  rake (~> 10.3)
-  rspec (~> 3.1)
-  vcr (~> 2.9)
-  webmock (~> 1.18)
-  wikidata-client!