fat_free_crm 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 9ec069bee0f0bade1f8ccaf400c483acf1806f99
-  data.tar.gz: 267efa985f28e83578031082c510be10d6e3eae7
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGUwMGExYzVhMDhiMGMwMWVmNjFhZGY3YWI3NTlhMDJmZTE5NzhmMA==
+  data.tar.gz: !binary |-
+    MWQ2MWI5N2NjNDM1M2FjYjI3NDgzYWRhYzkyM2ZiZTI5MWJmYWMxOA==
 SHA512:
-  metadata.gz: 196ac4c6e50d2987143f102fa7d0d22c36d5e55c2942944bb156741abf5b372ecb94ae3b09914b240781b78a934c3a2c8610b738673aa463630b0237d312522e
-  data.tar.gz: ac3c0ef7606d672faad180129d1803ba69f184b640b8509aff0cfce38c4e7dfbbc5758e6483e5cd25072747224ab7fba87824df26d64745953d9fc74411e8e84
+  metadata.gz: !binary |-
+    MmM0ZTIyNDg4MWExZDU5ZThjOTRhZDBmMzUzY2EyZWZkYmYyZWZjNDYzYzRj
+    OWRkMDY2ZTYwZjJkMzg0ODJiODMyNWU0NGNlZDg4MDQ5YWY4MDU2ODExNTAx
+    MjA2YTdlM2EwMTY2ODI3NmRkN2Y4MmJjODY2MjZhNWQzYjY2MGM=
+  data.tar.gz: !binary |-
+    OGUxMGRhMzc5MzIxZjMzYzQ2NTk2YzJhMWZhZWIxNTQ2ZjcxNGRhNWM5NTRk
+    NzY2YThmY2U1ZDMwMTU2OTYzNGVjN2Q5YzI0YjgzZTg1ZWI2NTUzNzczODU4
+    MTIyZDMyNzk2MDNiNjFhNzcyMDBkYjJmMDQxMTBmYTRjNTA2NzM=

data/lib/fat_free_crm/secret_token_generator.rb

@@ -16,17 +16,19 @@ module FatFreeCRM
       # If there is no secret token defined, we generate one and save it as a setting
       # If a token has been already been saved, we tell Rails to use it and move on.
       def setup!
-        if token.blank?
+        if !token_exists?
           Rails.logger.info("No secret key defined yet... generating and saving to Setting.secret_token")
-          generate_and_persist_token!
+          new_token!
         end
-        FatFreeCRM::Application.config.secret_token = token
-        raise(FAIL_MESSAGE) if FatFreeCRM::Application.config.secret_token.blank?# and !Rails.env.test?
+        # If db isn't setup yet, token will return nil, provide a randomly generated one for now.
+        FatFreeCRM::Application.config.secret_token = ( token || generate_token )
       end
 
       private
 
-      FAIL_MESSAGE = ::I18n.t('secret_token_generator.fail_message', default: "There was a problem generating the secret token. Please see lib/fat_free_crm/secret_token_generator.rb")
+      def token_exists?
+        Setting.secret_token.present?
+      end
 
       #
       # Read the current token from settings
@@ -36,12 +38,16 @@ module FatFreeCRM
 
       #
       # Create a new secret token and save it as a setting.
-      def generate_and_persist_token!
+      def new_token!
         quietly do
-          Setting.secret_token = SecureRandom.hex(64)
+          Setting.secret_token = generate_token
         end
       end
 
+      def generate_token
+        SecureRandom.hex(64)
+      end
+
       #
       # Yields to a block that executes with the logging turned off
       # This stops the secret token from being appended to the log

data/lib/fat_free_crm/version.rb

@@ -7,7 +7,7 @@ module FatFreeCRM
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 13
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/lib/secret_token_generator_spec.rb

@@ -13,22 +13,37 @@ describe FatFreeCRM::SecretTokenGenerator do
 
   describe "setup!" do
 
-    it "should not generate a token if one already exists" do
-      FatFreeCRM::SecretTokenGenerator.stub(:token).and_return(nil)
-      expect(FatFreeCRM::SecretTokenGenerator).to receive(:generate_and_persist_token!)
-      FatFreeCRM::Application.config.stub(:secret_token).and_return(token)
+    it "should not generate a new token if one exists" do
+      FatFreeCRM::SecretTokenGenerator.stub(:token_exists?).and_return(true)
+      FatFreeCRM::SecretTokenGenerator.should_not_receive(:new_token!)
       FatFreeCRM::SecretTokenGenerator.setup!
     end
 
-    it "should generate a token if none exists already" do
-      FatFreeCRM::SecretTokenGenerator.stub(:token).and_return(token)
-      expect(FatFreeCRM::SecretTokenGenerator).not_to receive(:generate_and_persist_token!)
+    it "should generate a token if none exists" do
+      FatFreeCRM::SecretTokenGenerator.stub(:token_exists?).and_return(false)
+      FatFreeCRM::SecretTokenGenerator.should_receive(:new_token!)
       FatFreeCRM::SecretTokenGenerator.setup!
     end
 
-    it "should raise an error if the token is still blank (should never happen)" do
-      FatFreeCRM::SecretTokenGenerator.stub(:token).and_return(nil)
-      lambda { FatFreeCRM::SecretTokenGenerator.setup! }.should raise_error(RuntimeError)
+    it "should generate a random token if not persisted" do
+      FatFreeCRM::SecretTokenGenerator.stub(:token_exists?).and_return(false)
+      FatFreeCRM::SecretTokenGenerator.stub(:new_token)
+      FatFreeCRM::SecretTokenGenerator.should_receive(:generate_token).exactly(:twice)
+      FatFreeCRM::SecretTokenGenerator.setup!
+    end
+
+  end
+
+  describe "token_exists?" do
+
+    it "should be true" do
+      Setting.stub(:secret_token).and_return(token)
+      FatFreeCRM::SecretTokenGenerator.send(:token_exists?).should eql(true)
+    end
+
+    it "should be false" do
+      Setting.stub(:secret_token).and_return(nil)
+      FatFreeCRM::SecretTokenGenerator.send(:token_exists?).should eql(false)
     end
 
   end
@@ -36,18 +51,27 @@ describe FatFreeCRM::SecretTokenGenerator do
   describe "token" do
 
     it "should delegate to Setting" do
-      expect(Setting).to receive(:secret_token).and_return(token)
-      expect(FatFreeCRM::SecretTokenGenerator.send(:token)).to eql(token)
+      Setting.should_receive(:secret_token).and_return(token)
+      FatFreeCRM::SecretTokenGenerator.send(:token).should eql(token)
+    end
+
+  end
+
+  describe "new_token!" do
+
+    it "should generate and set a new token" do
+      FatFreeCRM::SecretTokenGenerator.should_receive(:generate_token).and_return(token)
+      Setting.should_receive(:secret_token=).with(token)
+      FatFreeCRM::SecretTokenGenerator.send(:new_token!)
     end
 
   end
 
-  describe "generate_and_persist_token!" do
+  describe "generate_token!" do
 
     it "should generate a random token" do
-      expect(SecureRandom).to receive(:hex).with(64).and_return(token)
-      expect(Setting).to receive(:secret_token=).with(token)
-      FatFreeCRM::SecretTokenGenerator.send(:generate_and_persist_token!)
+      SecureRandom.should_receive(:hex).with(64).and_return(token)
+      FatFreeCRM::SecretTokenGenerator.send(:generate_token)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
   name: prototype-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -59,14 +59,14 @@ dependencies:
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -101,28 +101,28 @@ dependencies:
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -185,14 +185,14 @@ dependencies:
   name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -241,140 +241,154 @@ dependencies:
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: premailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: responds_to_parent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rails3-jquery-autocomplete
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: valium
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: ransack_ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: email_reply_parser_ffcrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An open source, Ruby on Rails customer relationship management platform
@@ -1410,12 +1424,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []