usps_flags-burgees 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d96230c4ec2e7cd7dda750c2b19bdc27eb79f4
-  data.tar.gz: 84efebaba3b2ae4671bc7c77ccab7a05acd859f7
+  metadata.gz: 17cdb6d1a1b7884bacbc3d43b20dabc43705d7da
+  data.tar.gz: 45b65770285a0f819a272f14e23715f216684e3b
 SHA512:
-  metadata.gz: f73ed8e9f2284807ad85620a98fec987f9547404296621628122d8af15bbbca1c92666f0eff8a3ccfb9235efb62013c09301dd6d3a356f4f88112c3b635d3a91
-  data.tar.gz: 59cf106b71371dd4a0f31712bd00495691ab422cb82173eb363a29a90a9210d46a34d89729e69c534c9fe2fbaaaf0156665f393882596256c60eb7b2569a96e9
+  metadata.gz: 75caed7857b7c30d4dbef2158a91b1f9ddfa4200e7b53c2f48b0092d4c6bb3dac37f25c4fc3d47f85ba89aee43438b9615f1c4a495cedc8ab7d97a94c03e50bf
+  data.tar.gz: 23676c88f54dab8765b5351be84f913b4c97c0f6056eb73369619467465de58d003a41489dcf937b94bd5d4ce7def66b5db716fb8d48747cbac879fb12886403

data.tar.gz.sig

@@ -1,2 +1 @@
-'�hV�������Z3�fo;Dh�~��Ϟa������(�G�d�hx�I�.N�g%&ʹ�?��}r^���y)G�m�����7��u�� ��5������<�VWj���U_�W �	7V!���Qaw����c��VE�|R��й
-�jsx���F�g�V�ū4Z�f�[��S��8‹6\B�l
+ӂ�3�i;�]�A��ʿ"����/Th( �P��9��E�J|Z��!�(B��v���i-�"�4�#φl�FOK�V	6�]�f��T��(H�u����G�f�

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    usps_flags-burgees (0.0.8)
-      usps_flags (~> 0.3, >= 0.3.10)
+    usps_flags-burgees (0.0.9)
+      usps_flags (~> 0.3, >= 0.3.11)
 
 GEM
   remote: https://rubygems.org/
@@ -34,7 +34,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    usps_flags (0.3.10)
+    usps_flags (0.3.11)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.8, >= 4.8.0)
       rubyzip (~> 1.2, >= 1.2.1)

data/README.md

@@ -10,7 +10,7 @@ An extension for [USPSFlags](https://github.com/jfiander/usps-flags) to provide
 ## Configuration
 
 ```ruby
-USPSFlags::Config.new do |config|
+USPSFlags.configure do |config|
   config.burgees_dir = "/path/to/burgees"
 end
 ```

data/lib/usps_flags/burgees/config.rb

@@ -2,33 +2,16 @@
 #
 # @private
 class USPSFlags::Config
-  @@burgees_dir ||= defined?(::Rails) ? "#{::Rails.root}/app/lib/usps-burgees" : "#{File.dirname(__dir__)}/output"
-
-  @@flags_dir ||= USPSFlags::Config.flags_dir
-  @@reset ||= USPSFlags::Config.reset
-  @@use_larger_tridents ||= USPSFlags::Config.use_larger_tridents
-
   attr_accessor :burgees_dir
 
-  alias :parent_initialize :initialize
   def initialize
-    @burgees_dir = @@burgees_dir
-    parent_initialize do |c|
-      c.flags_dir = @@flags_dir
-      c.reset = @@reset
-      c.use_larger_tridents = @@use_larger_tridents
-    end
+    get_defaults
+    get_extension_defaults
     yield self if block_given?
-    @@burgees_dir = @burgees_dir
   end
 
-  def self.burgees_dir
-    burgees_path = if defined?(::Rails)
-      "#{::Rails.root}/app/lib/usps-burgees"
-    else
-      @@burgees_dir
-    end
-    ::FileUtils.mkdir_p(burgees_path)
-    burgees_path
+  private
+  def get_extension_defaults
+    @burgees_dir ||= defined?(::Rails) ? "#{::Rails.root}/app/lib/usps-burgees" : "#{File.dirname(__dir__)}/output"
   end
 end

data/lib/usps_flags/burgees/customs.rb

@@ -3,13 +3,13 @@
 # @private
 class USPSFlags::Burgees::Customs
   def self.available
-    Dir.glob("#{USPSFlags::Config.burgees_dir}/**/*.svg").map do |b|
+    Dir.glob("#{USPSFlags.configuration.burgees_dir}/**/*.svg").map do |b|
       b.split("/").last.split(".svg").first.to_sym
     end
   end
 
   def self.get(burgee)
     raise USPSFlags::Errors::UnknownBurgee unless self.available.include?(burgee)
-    ::File.read("#{USPSFlags::Config.burgees_dir}/#{burgee}.svg")
+    ::File.read("#{USPSFlags.configuration.burgees_dir}/#{burgee}.svg")
   end
 end

data/spec/spec_helper.rb

@@ -13,14 +13,16 @@ RSpec::Expectations.configuration.on_potential_false_positives = :nothing
 RSpec.configure do |config|
   config.before(:suite) do
     $tmp_flags_dir = "tmp/flags"
+    $tmp_burgees_dir = "tmp/path/to/burgees"
 
-    USPSFlags::Config.new do |c|
+    USPSFlags.configure do |c|
       c.flags_dir = $tmp_flags_dir
+      c.burgees_dir = $tmp_burgees_dir
     end
   end
 
   config.after(:suite) do
     ::FileUtils.rm_rf("tmp") if ::Dir.exist?("tmp")
-    ::FileUtils.rm_rf(USPSFlags::Config.burgees_dir) if ::Dir.exist?(USPSFlags::Config.burgees_dir)
+    ::FileUtils.rm_rf(USPSFlags.configuration.burgees_dir) if ::Dir.exist?(USPSFlags.configuration.burgees_dir)
   end
 end

data/spec/usps_flags/burgees/config_spec.rb

@@ -2,14 +2,8 @@ require 'spec_helper'
 
 describe USPSFlags::Config do
   describe "general configuration" do
-    before(:each) do
-      @config = USPSFlags::Config.new do |c|
-        c.burgees_dir = "tmp/path/to/burgees"
-      end
-    end
-
     it "should correctly set the burgees_dir in USPSFlags::Config" do
-      expect(USPSFlags::Config.burgees_dir).to eql("tmp/path/to/burgees")
+      expect(USPSFlags.configuration.burgees_dir).to eql($tmp_burgees_dir)
     end
   end
 
@@ -20,10 +14,12 @@ describe USPSFlags::Config do
           "tmp/rails_app"
         end
       end
+
+      @config = USPSFlags::Config.new
     end
 
     it "should use the default Rails log directory" do
-      expect(USPSFlags::Config.burgees_dir).to eql("tmp/rails_app/app/lib/usps-burgees")
+      expect(@config.burgees_dir).to eql("tmp/rails_app/app/lib/usps-burgees")
     end
   end
 end

data/spec/usps_flags/burgees_spec.rb

@@ -116,8 +116,8 @@ describe USPSFlags::Burgees do
   end
 
   it "should generate a burgee from the custom directory" do
-    @custom_file = "#{USPSFlags::Config.burgees_dir}/birmingham.svg"
-    ::FileUtils.mkdir_p(USPSFlags::Config.burgees_dir)
+    @custom_file = "#{USPSFlags.configuration.burgees_dir}/birmingham.svg"
+    ::FileUtils.mkdir_p(USPSFlags.configuration.burgees_dir)
     ::FileUtils.cp("lib/usps_flags/burgees/builtins/birmingham.svg", @custom_file)
     f = ::File.open(@custom_file, "w+")
     f.write("<!-- Custom -->")
@@ -131,6 +131,6 @@ describe USPSFlags::Burgees do
     expect(@burgee.svg).to include("<title>Birmingham Burgee</title>")
     expect(@burgee.svg).to include("<!-- Custom -->")
 
-    ::FileUtils.rm_rf(USPSFlags::Config.burgees_dir)
+    ::FileUtils.rm_rf(USPSFlags.configuration.burgees_dir)
   end
 end

data/usps_flags-burgees.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'usps_flags-burgees'
-  s.version       = '0.0.8'
+  s.version       = '0.0.9'
   s.date          = '2017-11-08'
   s.summary       = 'Flag generator for United States Power Squadrons burgees'
   s.description   = 'An extension to the flag image (PNG, SVG) generator for United States Power Squadrons to generate burgees.'
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '~> 2.4'
 
-  s.add_runtime_dependency 'usps_flags', '~> 0.3',  '>= 0.3.10'
+  s.add_runtime_dependency 'usps_flags', '~> 0.3',  '>= 0.3.11'
 
   s.add_development_dependency 'rake',      '~> 12.1', '>= 12.1.0'
   s.add_development_dependency 'rspec',     '~> 3.7',  '>= 3.7.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps_flags-burgees
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Julian Fiander
@@ -41,7 +41,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement