web_font 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e82c28cd61268d82e7d3925b5988649d6d102ac
-  data.tar.gz: e8767e9107e5b23510a13e66419254210ef7331f
+  metadata.gz: a58c8ee8406ec663a1b730818ff893d6b96a90fe
+  data.tar.gz: c6672f7d1c9250366f8f6233279ae4921da6f3c7
 SHA512:
-  metadata.gz: b6fedf64c46588879edd0de43347a48c031ea8b22b212f0bf1f3026f6508848b6eab60f7a4e028cba1f7bff1a4336b71c47c8e71513405d1c27ec48182bdd644
-  data.tar.gz: db6837dd1172c41666544677078d637a36855c3a46f762280e8e4b81a811a096b5fd37a4295b30e96beaf62b31a68446039f3dac79a6cb79ba155c17c53bb977
+  metadata.gz: 2d7a262eb951d7a700c4b8f0ae84fc96ac71fc662847bb3dd4e4bf194fcd1927497f367e763e5a320c529715823d02b49a819718f501ac14699be59819dbfd1a
+  data.tar.gz: 8e2e1c59ce0aed0252108d10d3aae47a1918f8525c4233276656d853934f4a6a2cca61bcf67a2367d12b2d961705fafbdcfeef1c00262fa0d5854323a1b8f639

data/lib/web_font/version.rb

@@ -1,3 +1,3 @@
 module WebFont
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/test/{data → index}/google/fonts.json

@@ -130,9 +130,9 @@
     "700"
    ],
    "subsets": [
-    "greek",
     "latin-ext",
-    "latin"
+    "latin",
+    "greek"
    ],
    "version": "v2",
    "lastModified": "2014-01-07",
@@ -693,9 +693,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v4",
@@ -747,10 +747,10 @@
     "700italic"
    ],
    "subsets": [
-    "greek",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -947,11 +947,11 @@
     "700italic"
    ],
    "subsets": [
-    "greek",
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -1314,8 +1314,8 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v3",
    "lastModified": "2014-01-07",
@@ -2080,9 +2080,9 @@
     "700"
    ],
    "subsets": [
-    "greek",
     "latin-ext",
     "latin",
+    "greek",
     "greek-ext"
    ],
    "version": "v6",
@@ -2168,9 +2168,9 @@
     "700italic"
    ],
    "subsets": [
-    "greek",
     "latin-ext",
     "latin",
+    "greek",
     "greek-ext"
    ],
    "version": "v4",
@@ -2545,10 +2545,10 @@
     "700"
    ],
    "subsets": [
-    "greek",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v5",
@@ -2737,11 +2737,11 @@
     "700italic"
    ],
    "subsets": [
-    "greek",
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -2909,9 +2909,9 @@
     "700italic"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v5",
    "lastModified": "2014-01-07",
@@ -3146,10 +3146,10 @@
     "regular"
    ],
    "subsets": [
-    "greek",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -3407,9 +3407,9 @@
    ],
    "subsets": [
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v5",
@@ -3758,9 +3758,9 @@
     "900italic"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v1",
    "lastModified": "2013-12-05",
@@ -4106,9 +4106,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v5",
@@ -5287,9 +5287,9 @@
     "700italic"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v6",
@@ -5582,10 +5582,10 @@
     "600"
    ],
    "subsets": [
-    "greek",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -5767,9 +5767,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v4",
    "lastModified": "2014-01-07",
@@ -6050,9 +6050,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v2",
    "lastModified": "2014-01-07",
@@ -6214,9 +6214,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v8",
@@ -6322,9 +6322,9 @@
     "700italic"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v7",
    "lastModified": "2014-01-07",
@@ -6559,9 +6559,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v5",
    "lastModified": "2014-01-07",
@@ -6610,9 +6610,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v4",
    "lastModified": "2014-01-07",
@@ -7462,8 +7462,8 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v5",
    "lastModified": "2014-01-07",
@@ -7692,12 +7692,12 @@
     "700italic"
    ],
    "subsets": [
-    "greek",
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
     "devanagari",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -7721,11 +7721,11 @@
     "700italic"
    ],
    "subsets": [
-    "greek",
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -7778,8 +7778,8 @@
     "regular"
    ],
    "subsets": [
-    "greek",
-    "latin"
+    "latin",
+    "greek"
    ],
    "version": "v5",
    "lastModified": "2014-03-18",
@@ -8027,12 +8027,12 @@
     "800italic"
    ],
    "subsets": [
-    "greek",
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
     "devanagari",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -8061,11 +8061,11 @@
     "700"
    ],
    "subsets": [
-    "greek",
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -8085,9 +8085,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v2",
@@ -8313,9 +8313,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v2",
@@ -8335,9 +8335,9 @@
     "700italic"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v6",
@@ -8358,9 +8358,9 @@
     "700"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v7",
@@ -8379,9 +8379,9 @@
     "700"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v5",
@@ -8402,9 +8402,9 @@
     "700italic"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v6",
@@ -8425,9 +8425,9 @@
     "italic"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v6",
@@ -8686,8 +8686,8 @@
     "700italic"
    ],
    "subsets": [
-    "cyrillic",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v5",
    "lastModified": "2014-01-07",
@@ -8774,10 +8774,10 @@
     "700"
    ],
    "subsets": [
-    "greek",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -8818,9 +8818,9 @@
     "900italic"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v8",
    "lastModified": "2014-01-07",
@@ -8846,9 +8846,9 @@
     "900italic"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v2",
    "lastModified": "2014-01-07",
@@ -8887,9 +8887,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v2",
    "lastModified": "2014-01-07",
@@ -9036,10 +9036,10 @@
     "regular"
    ],
    "subsets": [
-    "greek",
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "greek",
+    "cyrillic"
    ],
    "version": "v2",
    "lastModified": "2014-01-07",
@@ -9088,9 +9088,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v2",
    "lastModified": "2014-01-07",
@@ -9598,11 +9598,11 @@
     "900italic"
    ],
    "subsets": [
-    "greek",
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -9636,11 +9636,11 @@
     "700italic"
    ],
    "subsets": [
-    "greek",
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -9666,11 +9666,11 @@
     "700"
    ],
    "subsets": [
-    "greek",
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -9959,9 +9959,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v5",
@@ -9978,9 +9978,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v2",
    "lastModified": "2014-01-07",
@@ -10167,9 +10167,9 @@
     "700italic"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v2",
    "lastModified": "2014-01-07",
@@ -10238,9 +10238,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v2",
    "lastModified": "2014-01-07",
@@ -10899,9 +10899,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v3",
    "lastModified": "2014-01-07",
@@ -11169,9 +11169,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
     "latin",
+    "cyrillic",
     "cyrillic-ext"
    ],
    "version": "v5",
@@ -11244,11 +11244,11 @@
     "700italic"
    ],
    "subsets": [
-    "greek",
     "vietnamese",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -11416,10 +11416,10 @@
     "700italic"
    ],
    "subsets": [
-    "greek",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -11444,10 +11444,10 @@
     "regular"
    ],
    "subsets": [
-    "greek",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -11468,10 +11468,10 @@
     "700italic"
    ],
    "subsets": [
-    "greek",
-    "cyrillic",
     "latin-ext",
     "latin",
+    "greek",
+    "cyrillic",
     "cyrillic-ext",
     "greek-ext"
    ],
@@ -11524,9 +11524,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v2",
    "lastModified": "2014-01-07",
@@ -11900,10 +11900,10 @@
     "latin-ext",
     "latin"
    ],
-   "version": "v3",
-   "lastModified": "2014-01-07",
+   "version": "v4",
+   "lastModified": "2014-05-13",
    "files": {
-    "regular": "http://themes.googleusercontent.com/static/fonts/warnes/v3/MXG7_Phj4YpzAXxKGItuBw.ttf"
+    "regular": "http://themes.googleusercontent.com/static/fonts/warnes/v4/MXG7_Phj4YpzAXxKGItuBw.ttf"
    }
   },
   {
@@ -12003,9 +12003,9 @@
     "regular"
    ],
    "subsets": [
-    "cyrillic",
     "latin-ext",
-    "latin"
+    "latin",
+    "cyrillic"
    ],
    "version": "v7",
    "lastModified": "2014-01-07",

data/test/lib/web_font/downloader_test.rb

@@ -21,11 +21,21 @@ describe WebFont::Downloader do
     end
 
     describe 'when fonts are in local cache' do
-      before { FileUtils.copy(Dir.glob('test/data/fonts/*.ttf'), 'test/local_cache/') }
+      before do
+        FileUtils.copy(Dir.glob('test/fonts/*.ttf'), 'test/local_cache/')
+        FileUtils.rm(Dir.glob(File.join(destination_path, '*')))
+      end
       after { FileUtils.rm(Dir.glob("#{WebFont.test_root}/local_cache/*.ttf")) }
 
+      it 'calls FileUtils 10 times' do
+        FileUtils.expects(:copy).with(instance_of(String), instance_of(String)).times(10)
+
+        downloader = WebFont::Downloader.new
+        downloader.download('Open Sans', destination_path)
+      end
+
       it 'copies files from local cache' do
-        Dir.glob('test/data/fonts/*.ttf').size.must_equal 11
+        Dir.glob('test/fonts/*.ttf').size.must_equal 11
 
         downloader = WebFont::Downloader.new
         downloader.download('Open Sans', destination_path)

data/test/lib/web_font/local_cache_test.rb

@@ -35,7 +35,7 @@ describe WebFont::LocalCache do
   describe '.save' do
     it 'saves font in local directory' do
       font_name = 'suwannaphum.ttf'
-      WebFont::LocalCache.save("test/data/fonts/#{font_name}")
+      WebFont::LocalCache.save("test/fonts/#{font_name}")
 
       File.exist?("test/local_cache/#{font_name}").must_equal true
     end
@@ -51,7 +51,7 @@ describe WebFont::LocalCache do
     end
 
     describe 'when font exist in local cache' do
-      before { FileUtils.copy('test/data/fonts/suwannaphum.ttf', 'test/local_cache') }
+      before { FileUtils.copy('test/fonts/suwannaphum.ttf', 'test/local_cache') }
 
       it 'returns path' do
         filename = 'suwannaphum.ttf'

data/test/test_helper.rb

@@ -1,9 +1,13 @@
 gem 'minitest'
+
 require 'minitest/autorun'
+require 'mocha/setup'
+
 require 'pp'
 
 require 'web_font'
-WebFont::Index.path = File.join(WebFont.test_root, 'data', 'google')
+
+WebFont::Index.path = File.join(WebFont.test_root, 'index', 'google')
 
 WebFont::LocalCache.cache      = true
-WebFont::LocalCache.cache_path = './test/local_cache'
+WebFont::LocalCache.cache_path = 'test/local_cache'

data/web_font.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'minitest', '~> 5.2.0'
+  spec.add_development_dependency 'mocha'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_font
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sophy Eung
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Download web fonts
 email:
 - ungsophy@gmail.com
@@ -71,19 +85,19 @@ files:
 - lib/web_font/index.rb
 - lib/web_font/local_cache.rb
 - lib/web_font/version.rb
-- test/data/fonts/Open-Sans-300.ttf
-- test/data/fonts/Open-Sans-300italic.ttf
-- test/data/fonts/Open-Sans-600.ttf
-- test/data/fonts/Open-Sans-600italic.ttf
-- test/data/fonts/Open-Sans-700.ttf
-- test/data/fonts/Open-Sans-700italic.ttf
-- test/data/fonts/Open-Sans-800.ttf
-- test/data/fonts/Open-Sans-800italic.ttf
-- test/data/fonts/Open-Sans-italic.ttf
-- test/data/fonts/Open-Sans-regular.ttf
-- test/data/fonts/suwannaphum.ttf
-- test/data/google/fonts.json
-- test/data/google/index.json
+- test/fonts/Open-Sans-300.ttf
+- test/fonts/Open-Sans-300italic.ttf
+- test/fonts/Open-Sans-600.ttf
+- test/fonts/Open-Sans-600italic.ttf
+- test/fonts/Open-Sans-700.ttf
+- test/fonts/Open-Sans-700italic.ttf
+- test/fonts/Open-Sans-800.ttf
+- test/fonts/Open-Sans-800italic.ttf
+- test/fonts/Open-Sans-italic.ttf
+- test/fonts/Open-Sans-regular.ttf
+- test/fonts/suwannaphum.ttf
+- test/index/google/fonts.json
+- test/index/google/index.json
 - test/lib/web_font/downloader_test.rb
 - test/lib/web_font/finder_test.rb
 - test/lib/web_font/index_test.rb
@@ -116,19 +130,19 @@ signing_key:
 specification_version: 4
 summary: Download web fonts
 test_files:
-- test/data/fonts/Open-Sans-300.ttf
-- test/data/fonts/Open-Sans-300italic.ttf
-- test/data/fonts/Open-Sans-600.ttf
-- test/data/fonts/Open-Sans-600italic.ttf
-- test/data/fonts/Open-Sans-700.ttf
-- test/data/fonts/Open-Sans-700italic.ttf
-- test/data/fonts/Open-Sans-800.ttf
-- test/data/fonts/Open-Sans-800italic.ttf
-- test/data/fonts/Open-Sans-italic.ttf
-- test/data/fonts/Open-Sans-regular.ttf
-- test/data/fonts/suwannaphum.ttf
-- test/data/google/fonts.json
-- test/data/google/index.json
+- test/fonts/Open-Sans-300.ttf
+- test/fonts/Open-Sans-300italic.ttf
+- test/fonts/Open-Sans-600.ttf
+- test/fonts/Open-Sans-600italic.ttf
+- test/fonts/Open-Sans-700.ttf
+- test/fonts/Open-Sans-700italic.ttf
+- test/fonts/Open-Sans-800.ttf
+- test/fonts/Open-Sans-800italic.ttf
+- test/fonts/Open-Sans-italic.ttf
+- test/fonts/Open-Sans-regular.ttf
+- test/fonts/suwannaphum.ttf
+- test/index/google/fonts.json
+- test/index/google/index.json
 - test/lib/web_font/downloader_test.rb
 - test/lib/web_font/finder_test.rb
 - test/lib/web_font/index_test.rb