fauve 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62e3905a46d1054c308be5dda7bb4c41d3371eac
-  data.tar.gz: 1cc8599130f0f3240e1ee16e2e9ed4745ee5863a
+  metadata.gz: 8862c71f9ab4ddec3a1b22801f9bb62b200fa45f
+  data.tar.gz: 2e3c90592dbb4103e719aa328eb4e5f0a87c332e
 SHA512:
-  metadata.gz: 8ed476915a985221daba2f9fddb42fcce17e02d584029fb89b59f39460e946799e9834392a582df187a352a9dbcba7701ac47b88f8e600ad48ed0344cbd1098c
-  data.tar.gz: a4e0e32cbe55744dd9fbd95749a8bb0b7ea3d5c4f3c3d058bce490a165fd63778eaa3c8d1b656eed541182c24e32051a00611f13a4fa0c9c544fabdcd68b6c20
+  metadata.gz: 9b4de518d61ee6efc7c684e3acb556198e128419d68437ab2e3f4079d7d13b87d5d6efb34f13ef2e50db98eed7f587ee728f158610612482e24b4f704d363be4
+  data.tar.gz: 4d6c170b18b8c5c8d8eab772cb67b7cce86f26e7bf700c60912a7dc8b30f3a0bafbf38cab4bc9c192165ac3eeb5ddac760af1032dd4fa6ae601ea3b4f8fb96ed

data/lib/fauve/colour_scheme.rb

@@ -1,24 +1,22 @@
 module Fauve
 
-    # Representation of a colour_scheme.
-    # Holds a raw colour map as well as the current section,
-    # reference and colour
+  # Representation of a colour_scheme.
+  # Holds the current section, reference and colour
 
   class ColourScheme
 
     attr_accessor :colour
     alias_method :to_s, :colour
 
-    def initialize(map: Fauve::Config::colour_map, section_name: :app, reference_name: 0)
-      @colour_map       = Fauve::Scheme::ColourMap.new(map)
-      @section          = Fauve::Scheme::Section.new(colour_map, section_name)
+    def initialize(section_name: :app, reference_name: 0)
+      @section          = Fauve::Scheme::Section.new(section_name)
       @reference        = Fauve::Scheme::Reference.new(reference_name)
-      @colour           = Fauve::Scheme::Colour.new(colour_map, section, reference).colour
+      @colour           = Fauve::Scheme::Colour.new(section, reference).colour
     end
 
     private
 
-    attr_reader :section, :reference, :colour_map
+    attr_reader :section, :reference
 
   end
 end

data/lib/fauve/helpers.rb

@@ -17,7 +17,6 @@ module Sass
 
       def raw_colour
         Fauve::ColourScheme.new(
-          map: Fauve::Config::colour_map,
           section_name: fauve_section,
           reference_name: fauve_reference
         ).to_s

data/lib/fauve/railtie.rb

@@ -7,6 +7,7 @@ module Fauve::Rails
 
     initializer :fauve_setup do |app|
       config.fauve.config_file = File.join(Rails.root, 'config/fauve.yml') unless config.fauve.config_file
+      Fauve::Scheme::ColourMap.instance.map = YAML.load_file(Fauve::Rails::Railtie.config.fauve.config_file)
     end
 
   end

data/lib/fauve/scheme/colour.rb

@@ -12,8 +12,8 @@ module Fauve
 
       attr_reader :filters, :raw_colour
 
-      def initialize(colour_map, section, reference)
-        @colour_map = colour_map
+      def initialize(section, reference)
+        @colour_map = ColourMap.instance
         @section    = section
         @reference  = reference
         @candidate  = operations.shift
@@ -44,17 +44,17 @@ module Fauve
       end
 
       def resolve(colour)
-        raise Fauve::CircularReferenceError.new('Circular reference detected') if @@candidates.include?(colour)
+        raise CircularReferenceError.new('Circular reference detected') if @@candidates.include?(colour)
         @@candidates << colour
         @candidate = recursed(colour).raw_colour
       end
 
       def recursed(colour)
-        self.class.new(colour_map, source_section(colour), source_reference(colour))
+        self.class.new(source_section(colour), source_reference(colour))
       end
 
       def source_section(key)
-        section.class.new(colour_map, key[SECTION_NAME_REGEX])
+        section.class.new(key[SECTION_NAME_REGEX])
       end
 
       def source_reference(key)
@@ -64,7 +64,7 @@ module Fauve
       def operations
         @operations ||= section.to_h[reference.key].split(',').collect{ |element| element.strip }
       rescue
-        raise Fauve::UndefinedReferenceError.new("Reference isn't a valid index or key")
+        raise UndefinedReferenceError.new("Reference #{reference.key} isn't a valid index or key")
       end
 
       def is_valid_hex_colour?

data/lib/fauve/scheme/colour_map.rb

@@ -2,17 +2,14 @@ module Fauve
   module Scheme
 
     # Representation of a colour map as part of a wider scheme.
-    # Holds the colour map hash as defined in the options yaml file
+    # Holds the colour map hash as defined in the fauve.yaml file
 
     class ColourMap
 
-      attr_reader :map
+      include Singleton
 
-      def initialize(map)
-        @map = map
-      end
+      attr_accessor :map
 
-      private
     end
   end
 end

data/lib/fauve/scheme/section.rb

@@ -4,15 +4,15 @@ module Fauve
     # Representation of a section key as part of a wider scheme.
     # Holds a section name, which points to a top-level key within
     # a colour scheme.
-    # Takes a Fauve::Scheme::ColourMap and a section name (string)
+    # Takes a section name (string)
 
     class Section
 
       attr_reader :name
 
-      def initialize(colour_map, name)
-        @colour_map = colour_map
+      def initialize(name)
         @name       = name.to_s
+        @colour_map = ColourMap.instance
       end
 
       def to_h

data/lib/fauve/version.rb

@@ -1,3 +1,3 @@
 module Fauve
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/fauve.rb

@@ -1,6 +1,5 @@
 require 'fauve/version'
 require 'fauve/errors'
-require 'fauve/config'
 
 if defined? Rails
   require 'sprockets/railtie'
@@ -14,8 +13,8 @@ if defined? Rails
   require 'fauve/helpers'
 end
 
+
 module Fauve
   module Rails
   end
-end
-
+end

data/spec/lib/fauve/colour_scheme_spec.rb

@@ -4,11 +4,10 @@ module Fauve
 
   describe ColourScheme do
 
-    let(:map)   { YAML.load_file File.expand_path("./spec/fixtures/fauve.yml") }
-    let(:section_name) { :scheme }
+    let(:section_name)   { :scheme }
     let(:reference_name) { 2 }
 
-    subject { described_class.new( map: map, section_name: section_name, reference_name: reference_name ) }
+    subject { described_class.new(section_name: section_name, reference_name: reference_name) }
 
     describe '#initialize' do
       it 'instantiates a full colour scheme' do

data/spec/lib/fauve/helpers_spec.rb

@@ -4,15 +4,10 @@ module Sass
   module Script
     describe Functions do
 
-      let(:config)    { YAML.load_file File.expand_path("./spec/fixtures/fauve.yml") }
       let(:section)   { :scheme }
-      let(:filters)   { Hash.new }
+      let(:filters)   { [] }
       let(:reference) { 3 }
 
-      before do
-        allow(Fauve::Config).to receive(:colour_map).and_return(config)
-      end
-
       subject { FauveFunction.new }
 
       describe '#fauve' do

data/spec/lib/fauve/railtie_spec.rb

@@ -16,6 +16,21 @@ module Fauve
           expect(subject.config.fauve).to be_a ActiveSupport::OrderedOptions
         end
       end
+
+      context 'configuration loading' do
+        it 'loads an initializer' do
+          expect(described_class.instance.initializers.first.name).to eq :fauve_setup
+          expect(described_class.instance.railtie_name).to eq 'fauve_rails_railtie'
+        end
+      end
+
+      context 'ColourMap configuration' do
+
+        it 'sets up a ColourMap object with a hash from fauve.yml' do
+          expect(described_class.instance.initializers.first.block.source).to match /config\/fauve\.yml/
+          expect(described_class.instance.initializers.first.block.source).to match /Fauve::Scheme::ColourMap.instance.map =/
+        end
+      end
     end
   end
 end

data/spec/lib/fauve/scheme/colour_spec.rb

@@ -4,13 +4,11 @@ module Fauve
   module Scheme
     describe Colour do
 
-      let(:config)        { YAML.load_file File.expand_path("./spec/fixtures/fauve.yml") }
-      let(:colour_map)    { Fauve::Scheme::ColourMap.new(config) }
       let(:section_name)  { :scheme }
-      let(:section)       { Fauve::Scheme::Section.new(colour_map, section_name) }
+      let(:section)       { Fauve::Scheme::Section.new(section_name) }
       let(:reference)     { Fauve::Scheme::Reference.new(reference_name) }
 
-      subject { described_class.new( colour_map, section, reference ) }
+      subject { described_class.new(section, reference) }
 
       describe '#initialize' do
         context 'when passed filters' do

data/spec/lib/fauve/scheme/section_spec.rb

@@ -5,10 +5,8 @@ module Fauve
     describe Section do
 
       let(:section_name) { 'i_like_bananas' }
-      let(:config)  { YAML.load_file File.expand_path("./spec/fixtures/fauve.yml") }
-      let(:colour_map) { Fauve::Scheme::ColourMap.new(config) }
 
-      subject { described_class.new(colour_map, section_name) }
+      subject { described_class.new(section_name) }
 
       describe '#initialize' do
         it 'exposes the section name' do

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'pry'
 require 'sass'
 require 'yaml'
 require 'sprockets/railtie'
-require 'fauve/config'
 require 'fauve/railtie'
 require 'fauve/errors'
 require 'fauve/engine'
@@ -15,3 +14,5 @@ require 'fauve/scheme/reference'
 require 'fauve/scheme/colour'
 require 'fauve/colour_scheme'
 require 'fauve/helpers'
+
+Fauve::Scheme::ColourMap.instance.map = YAML.load_file(File.expand_path("./spec/fixtures/fauve.yml"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fauve
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Daniel Angel-Bradford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -187,7 +187,6 @@ files:
 - lib/fauve.rb
 - lib/fauve/cli.rb
 - lib/fauve/colour_scheme.rb
-- lib/fauve/config.rb
 - lib/fauve/engine.rb
 - lib/fauve/errors.rb
 - lib/fauve/helpers.rb
@@ -199,7 +198,6 @@ files:
 - lib/fauve/version.rb
 - spec/fixtures/fauve.yml
 - spec/lib/fauve/colour_scheme_spec.rb
-- spec/lib/fauve/config_spec.rb
 - spec/lib/fauve/engine_spec.rb
 - spec/lib/fauve/helpers_spec.rb
 - spec/lib/fauve/railtie_spec.rb
@@ -234,7 +232,6 @@ summary: Fauve lets you manage your app's colour scheme
 test_files:
 - spec/fixtures/fauve.yml
 - spec/lib/fauve/colour_scheme_spec.rb
-- spec/lib/fauve/config_spec.rb
 - spec/lib/fauve/engine_spec.rb
 - spec/lib/fauve/helpers_spec.rb
 - spec/lib/fauve/railtie_spec.rb

data/lib/fauve/config.rb

@@ -1,12 +0,0 @@
-module Fauve
-
-  module Config
-
-    def self.colour_map
-      YAML.load_file Fauve::Rails::Railtie.config.fauve.config_file
-    end
-
-  end
-
-end
-

data/spec/lib/fauve/config_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-module Fauve
-  describe Config do
-
-    let(:config_file)   { File.expand_path("./spec/fixtures/fauve.yml") }
-
-    before do
-      allow(Fauve::Rails::Railtie.config.fauve).to receive(:config_file).and_return(config_file)
-    end
-
-    subject { described_class }
-
-    describe '.colour_map' do
-      it 'returns a hashified colour scheme' do
-        expect(subject.colour_map).to be_a Hash
-      end
-
-      it 'includes all sections' do
-        expect(subject.colour_map).to have_key 'scheme'
-        expect(subject.colour_map).to have_key 'forms'
-        expect(subject.colour_map).to have_key 'links'
-        expect(subject.colour_map).to have_key 'buttons'
-        expect(subject.colour_map).to have_key 'multi_level'
-        expect(subject.colour_map).to have_key 'odd_case'
-      end
-    end
-  end
-end