fluidfeatures-rails 0.1.0 → 0.1.1

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+  - ruby-head
+  #- jruby-head
+  - ree
+gemfile:
+  - test/testapp/Gemfile
+before_install: cd test/testapp
+# uncomment this line if your project needs to run something other than `rake`:
+script: bundle exec rspec spec

data/README.md

@@ -1,4 +1,7 @@
+[![Build Status](https://secure.travis-ci.org/BigFastSite/fluidfeatures-rails.png)](http://travis-ci.org/BigFastSite/fluidfeatures-rails)
+
 fluidfeatures-rails
 ===================
 
-Rails client for API of FluidFeatures.com
+Rails client for API of FluidFeatures.com
+

data/Rakefile

@@ -3,10 +3,10 @@ Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
-namespace :test do
-  Rake::TestTask.new(:all) do |t|
-    t.libs << "test"
-    t.pattern = 'test/**/*_test.rb'
-    t.verbose = true
+task :default => :test
+
+task :test do
+  Dir.chdir("test/testapp") do
+    exec("bundle exec rspec spec")
   end
 end

data/fluidfeatures-rails.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   #s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
-  s.add_dependency "rails", "~>3.0"
+  #s.add_dependency "rails", "~>3.0"
   s.add_dependency "persistent_http", "~>1.0.3"
 end

data/lib/fluidfeatures/rails/version.rb

@@ -1,5 +1,5 @@
 module FluidFeatures
   module Rails
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/fluidfeatures/rails.rb

@@ -214,13 +214,11 @@ module ActionController
     # We call user_id to get the current user's unique id.
     #
     def fluidfeature(feature_name, defaults={})
-      @features_hit ||= []
-      @features_hit << feature_name
       if defaults === true or defaults === false
         defaults = { :enabled => defaults }
       end
       global_defaults = fluidfeatures_defaults || {}
-      version = (defaults[:version] || global_defaults[:version]).to_s
+      version_name = (defaults[:version] || global_defaults[:version]).to_s
       if not @features
         fluidfeatures_retrieve_user_features
       end
@@ -228,8 +226,8 @@ module ActionController
         if @features[feature_name].is_a? FalseClass or @features[feature_name].is_a? TrueClass
           enabled = @features[feature_name]
         elsif @features[feature_name].is_a? Hash
-          if @features[feature_name].has_key? version
-            enabled = @features[feature_name][version]
+          if @features[feature_name].has_key? version_name
+            enabled = @features[feature_name][version_name]
           end
         end
       end
@@ -239,9 +237,16 @@ module ActionController
         # Tell FluidFeatures about this amazing new feature...
         options = Hash.new(defaults)
         options[:enabled] = enabled
-        options[:version] = version
-        ::Rails.logger.error "fluidfeature: #{feature_name.to_s} #{version}"
-        FluidFeatures::Rails.unknown_feature_hit(feature_name, version, options)
+        if options.has_key? :version
+          options.remove(:version)
+        end
+        ::Rails.logger.debug "fluidfeature: seeing feature '#{feature_name.to_s}' (version '#{version_name.to_s}') for the first time."
+        FluidFeatures::Rails.unknown_feature_hit(feature_name, version_name, options)
+      end
+      if enabled
+        @features_hit ||= {}
+        @features_hit[feature_name] ||= {}
+        @features_hit[feature_name][version_name] = {}
       end
       enabled
     end

data/test/testapp/.gitignore

@@ -0,0 +1,15 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/test/testapp/Gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'railties'
+gem 'tzinfo'
+gem 'fluidfeatures-rails', :path => '../..'
+gem "rspec-rails", "~> 2.0"
+gem "fakeweb"
+gem "json_pure"
+gem "json_spec"

data/test/testapp/Rakefile

@@ -0,0 +1,8 @@
+require "rspec/core/rake_task"
+
+task :default => :core
+
+RSpec::Core::RakeTask.new(:core) do |spec|
+  spec.pattern = 'spec/*/*_spec.rb'
+  spec.rspec_opts = ['--backtrace']
+end

data/test/testapp/app/controllers/application_controller.rb

@@ -0,0 +1,17 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+
+  before_filter :authenticate_user
+
+  # simple authentication. user passes their id
+  def authenticate_user
+    user_id = params[:user_id]
+    unless user_id
+      raise "user_id not given"
+    end
+    
+    # inform fluidfeatures gem of the user id
+    fluidfeatures_set_user_id(user_id)
+  end
+
+end

data/test/testapp/app/controllers/home_controller.rb

@@ -0,0 +1,17 @@
+class HomeController < ApplicationController
+  def index
+    enabled_features = []
+    # apples is enabled by default
+    if fluidfeature("apples", { :enabled => true })
+      enabled_features << "apples"
+    end
+    %w{oranges lemons}.each do |feature_name|
+      if fluidfeature(feature_name)
+        enabled_features << feature_name
+      end
+    end
+    # render a simple page that is a list of features enabled
+    # separated by one space character
+    render :inline => enabled_features.join(" ")
+  end
+end

data/test/testapp/config/application.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../boot', __FILE__)
+
+require "action_controller/railtie"
+require 'fluidfeatures/rails'
+
+module Testapp
+  class Application < Rails::Application
+    FluidFeatures::Rails.initializer
+  end
+end

data/test/testapp/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/testapp/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Testapp::Application.instance.initialize!

data/test/testapp/config/environments/test.rb

@@ -0,0 +1,9 @@
+Testapp::Application.configure do
+  config.cache_classes = true
+  config.whiny_nils = true
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+  config.action_dispatch.show_exceptions = false
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/test/testapp/config/initializers/secret_token.rb

@@ -0,0 +1 @@
+Testapp::Application.config.secret_token = "some secret phrase of at least 30 characters"

data/test/testapp/config/routes.rb

@@ -0,0 +1,3 @@
+Testapp::Application.routes.draw do
+  root :to => "home#index"
+end

data/test/testapp/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Testapp::Application

data/test/testapp/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/test/testapp/spec/controllers/home_controller_spec.rb

@@ -0,0 +1,118 @@
+require 'spec_helper'
+require 'fakeweb'
+require 'json'
+require 'json_spec'
+
+describe HomeController do
+
+  describe '#index' do
+
+    before do
+      FakeWeb.register_uri(
+        :get,
+        File.join(ENV["FLUIDFEATURES_BASEURI"], "/app/123/user/1/features"),
+        :body => JSON.generate({}) # no features registered yet
+      )
+      FakeWeb.register_uri(
+        :get,
+        File.join(ENV["FLUIDFEATURES_BASEURI"], "/app/123/user/2/features"),
+        :body => JSON.generate({
+          :apples => false, 
+          :oranges => true, 
+          :lemons => true
+        })
+      )
+      [1,2].each do |user_id|
+        FakeWeb.register_uri(
+          :post,
+          File.join(ENV["FLUIDFEATURES_BASEURI"], "/app/123/user/#{user_id.to_s}/features/hit"),
+          :body => ""
+        )
+      end
+    end
+
+    it 'should return only the default enabled features for user 1' do
+      get :index, { :user_id => 1 }
+      response.response_code.should == 200
+      response.body.should == "apples"
+
+      # Check the call to features hit
+      features_hit_request = FakeWeb.last_request
+      JsonSpec.exclude_keys("duration")
+      features_hit_request.body.should be_json_eql(%({
+        "features": {
+          "hit": [
+            "apples",
+            "oranges",
+            "lemons"
+          ],
+          "unknown": {
+            // features that we have not seen before
+            "apples": {
+              "versions": {
+                "1": {
+                  "enabled": true
+                }
+              }
+            },
+            "lemons": {
+              "versions": {
+                "1": {
+                  "enabled": false
+                }
+              }
+            },
+            "oranges": {
+              "versions": {
+                "1": {
+                  "enabled": false
+                }
+              }
+            }
+          }
+        },
+        "stats": {
+          "fetch": {
+            // duration ignored
+          },
+          "request": {
+            // duration ignored
+          }
+        }
+      }))
+    end
+
+    it 'should not return the feature for user 2' do
+      get :index, { :user_id => 2 }
+      response.response_code.should == 200
+      response.body.should == "oranges lemons"
+
+      # Check the call to features hit
+      features_hit_request = FakeWeb.last_request
+      JsonSpec.exclude_keys("duration")
+      features_hit_request.body.should be_json_eql(%({
+        "features": {
+          "hit": [
+            "apples",
+            "oranges",
+            "lemons"
+          ],
+          "unknown": {
+            // no unknown features
+          }
+        },
+        "stats": {
+          "fetch": {
+            // duration ignored
+          },
+          "request": {
+            // duration ignored
+          }
+        }
+      }))
+    end
+
+  end
+
+end
+

data/test/testapp/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+ENV["RAILS_ENV"] ||= 'test'
+
+ENV["FLUIDFEATURES_BASEURI"] ||= "http://www.fluidfeatures.com/service"
+ENV["FLUIDFEATURES_APPID"] ||= "123"
+ENV["FLUIDFEATURES_SECRET"] ||= "ssssshhhhhh"
+
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluidfeatures-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: persistent_http
   requirement: !ruby/object:Gem::Requirement
@@ -51,12 +35,28 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - fluidfeatures-rails.gemspec
 - lib/fluidfeatures/rails.rb
 - lib/fluidfeatures/rails/version.rb
+- test/testapp/.gitignore
+- test/testapp/Gemfile
+- test/testapp/Rakefile
+- test/testapp/app/controllers/application_controller.rb
+- test/testapp/app/controllers/home_controller.rb
+- test/testapp/config.ru
+- test/testapp/config/application.rb
+- test/testapp/config/boot.rb
+- test/testapp/config/environment.rb
+- test/testapp/config/environments/test.rb
+- test/testapp/config/initializers/secret_token.rb
+- test/testapp/config/routes.rb
+- test/testapp/script/rails
+- test/testapp/spec/controllers/home_controller_spec.rb
+- test/testapp/spec/spec_helper.rb
 homepage: https://github.com/BigFastSite/fluidfeatures-rails
 licenses: []
 post_install_message: