whitelabel 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 558aca5d0964d9a442e15e4a19631ea087fefcdf
+  data.tar.gz: 1d564809f2bbab30e5db725f02ed1471658a8db3
+SHA512:
+  metadata.gz: 98640bee5706135bd032cb3825b6d0728356357e006f4e03198f4127f89636ca345240dd7512b96fc26e278576738e8792829e0cf1d0d4f3805630092ec2caa3
+  data.tar.gz: 2485b18754f36456dbce445619ec61a7154e7a0dd726d1db5f45d8d21cdf8cff5b6f273b989915174580e694cd70a4772baa0b4968fd685411631212400593f1

data/.ruby-version

@@ -0,0 +1 @@
+2.2.0

data/.travis.yml

@@ -1,10 +1,7 @@
 script: "bundle exec rspec"
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.2.0
   - rbx
-  - rbx-2.0
-  - ree
   - ruby-head
   - jruby

data/Gemfile.lock

@@ -6,27 +6,33 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.0.6)
-    diff-lcs (1.1.3)
-    method_source (0.7.1)
-    pry (0.9.8.4)
-      coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    slop (2.4.4)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    method_source (0.8.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.4.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    slop (3.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  pry (~> 0.9)
-  rspec (~> 2.9)
+  pry (~> 0.10)
+  rake (~> 10.4)
+  rspec (~> 3.1)
   whitelabel!

data/README.md

@@ -41,7 +41,7 @@ Whitelabel works the same way I18n does, just set it up in your ApplicationContr
     
     def switch_label
       unless Whitelabel.label_for(request.subdomains.first)
-        redirect_to(labels_url(subdomain: false), alert: "Please select a Label!") and return
+        redirect_to(labels_url(subdomain: false), alert: "Please select a Label!")
       end
     end
 

data/lib/whitelabel.rb

@@ -36,6 +36,10 @@ module Whitelabel
       self.label = current_label if current_label
     end
 
+    def each_label(&block)
+      labels.map { |label| with_label(label, &block) }
+    end
+
     def [](accessor)
       raise "set a label before calling '#{accessor}'" if self.label.nil?
       self.label.send :"#{accessor}"

data/lib/whitelabel/version.rb

@@ -1,3 +1,3 @@
 module Whitelabel
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/lib/whitelabel_spec.rb

@@ -21,57 +21,64 @@ describe Whitelabel do
       Whitelabel.from_file(path)
     end
 
-    it "should have two different labels" do
-      Whitelabel.find_label('test')[:label_id].should eql('test')
-      Whitelabel.find_label('uschi')[:label_id].should eql('uschi')
-      Whitelabel.find_label('wrong').should be_nil
+    it "finds two different labels" do
+      expect(Whitelabel.find_label('test')[:label_id]).to eql('test')
+      expect(Whitelabel.find_label('uschi')[:label_id]).to eql('uschi')
+      expect(Whitelabel.find_label('wrong')).to be_nil
     end
 
-    it "should work thread safe" do
+    it "works thread safe" do
       Whitelabel.label = :bla
       Thread.new { Whitelabel.label = nil }
-      Whitelabel.label.should_not be_nil
+      expect(Whitelabel.label).to_not be_nil
     end
 
-    it "should find a label for a pattern" do
-      Whitelabel.label_for('uschi').should_not be_nil
-      Whitelabel.label.name.should eql('Uschi Müller')
+    it "finds a label for a pattern" do
+      expect(Whitelabel.label_for('uschi')).to_not be_nil
+      expect(Whitelabel.label.name).to eql('Uschi Müller')
     end
 
-    it "should not find a label for a missing pattern" do
-      Whitelabel.label_for('').should be_nil
+    it "does not find a label for a missing pattern" do
+      expect(Whitelabel.label_for('')).to be_nil
     end
 
-    it "should enable a temporary label" do
+    it "enables a temporary label" do
       label = Whitelabel.label_for('uschi')
-      Whitelabel.label.should eql(label)
+      expect(Whitelabel.label).to eql(label)
       tmp = Whitelabel.find_label('test')
       Whitelabel.with_label(tmp) do
-        Whitelabel.label.should eql(tmp)
+        expect(Whitelabel.label).to eql(tmp)
       end
-      Whitelabel.label.should eql(label)
+      expect(Whitelabel.label).to eql(label)
     end
 
-    it "should throw a meaningfull error when no label is set" do
+    it "throws a meaningfull error when no label is set" do
       expect { Whitelabel[:blame] }.to raise_error("set a label before calling 'blame'")
     end
 
+    context "each_label" do
+      it "iterates all labels" do
+        names = Whitelabel.each_label { Whitelabel[:name] }
+        expect(names).to eql(["bla", "Uschi Müller"])
+      end
+    end
+
     context "with current label" do
       before(:each) do
         Whitelabel.label = dummy
       end
 
       context "resetting" do
-        it "should reset the current label" do
-          Whitelabel.label.should be(dummy)
+        it "resets the current label" do
+          expect(Whitelabel.label).to be(dummy)
           Whitelabel.reset!
-          Whitelabel.label.should be_nil
+          expect(Whitelabel.label).to be_nil
         end
       end
 
       context "accessing values" do
-        it "should access a label property via []" do
-          Whitelabel[:name].should eql('some_name')
+        it "accesses a label property via []" do
+          expect(Whitelabel[:name]).to eql('some_name')
         end
       end
     end

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require "whitelabel"
 require "pry"
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 end

data/whitelabel.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../lib/whitelabel/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Peter Schröder"]
+  gem.authors       = ["Peter Schröder"]
   gem.email         = ["phoetmail@googlemail.com"]
   gem.description = gem.summary = %q{This gem helps you providing whitelabel functionality in your application}
   gem.homepage      = "https://github.com/phoet/whitelabel"
@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Whitelabel::VERSION
 
-  gem.add_development_dependency('rspec', '~> 2.9')
-  gem.add_development_dependency('pry', '~> 0.9')
+  gem.add_development_dependency('rspec', '~> 3.1')
+  gem.add_development_dependency('pry', '~> 0.10')
+  gem.add_development_dependency('rake', '~> 10.4')
 end

metadata

@@ -1,48 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: whitelabel
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
-- Peter Schröder
+- Peter Schröder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 description: This gem helps you providing whitelabel functionality in your application
 email:
 - phoetmail@googlemail.com
@@ -50,11 +59,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -67,27 +76,26 @@ files:
 - whitelabel.gemspec
 homepage: https://github.com/phoet/whitelabel
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem helps you providing whitelabel functionality in your application
 test_files:
 - spec/fixtures/whitelabel.yml

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@whitelabel --create