ixtlan-core 0.6.0 → 0.6.1

data/spec/controller.rb~

@@ -0,0 +1,8 @@
+class Controller
+
+
+  def warn(msg)
+    @warn = msg
+  end
+
+end

data/spec/x_headers_spec.rb~

@@ -0,0 +1,74 @@
+require 'controller'
+
+shared_examples 'a X-Headers' do
+
+  it 'should be able to switch off' do
+    subject.send method, :inline => "asd", :x_frame_headers => :off, :x_content_type_headers => :off, :x_xss_protection_headers => :off
+    subject.response.headers.should == {}
+  end
+
+end
+
+class MyController < Controller
+  x_frame_headers :sameorigin
+  x_content_type_headers :off
+  x_xss_protection_headers :disabled
+end
+
+[:render, :send_file, :send_data].each do |method|
+  describe "using controller method #{method}" do
+    context "with simple controller" do
+      before do
+        Rails.configuration.x_frame_headers = nil
+        Rails.configuration.x_content_type_headers = nil
+        Rails.configuration.x_xss_protection_headers = nil
+      end
+      subject { Controller.new }
+      
+      it 'should use default' do
+        subject.send method, :inline => "asd"
+        subject.response.headers.should == {"X-Frame-Options"=>"DENY", "X-Content-Type-Options"=>"nosniff", "X-XSS-Protection"=>"1; mode=block"}
+      end
+      
+      it_behaves_like "a X-Headers" do
+        let(:method) { method }
+      end
+    end
+    
+    context "with controller with header configuration" do
+      before do
+        Rails.configuration.x_frame_headers = nil
+        Rails.configuration.x_content_type_headers = nil
+        Rails.configuration.x_xss_protection_headers = nil
+      end
+      subject { MyController.new }
+      
+      it 'should use configuration' do
+        subject.send method, :inline => "asd"
+        subject.response.headers.should == {"X-Frame-Options"=>"SAMEORIGIN", "X-XSS-Protection"=>"0"}
+      end
+      
+      it_behaves_like "a X-Headers" do
+        let(:method) { method }
+      end
+    end
+    
+    context "with simple controller with rails configuration" do
+      before do
+        Rails.configuration.x_frame_headers = :sameorigin
+        Rails.configuration.x_content_type_headers = :off
+        Rails.configuration.x_xss_protection_headers = :disabled
+      end
+      subject { Controller.new }
+      
+      it 'should use configuration' do
+        subject.send method, :inline => "asd"
+        subject.response.headers.should == {"X-Frame-Options"=>"SAMEORIGIN", "X-XSS-Protection"=>"0"}
+      end
+      
+      it_behaves_like "a X-Headers" do
+        let(:method) { method }
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: ixtlan-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
   - mkristian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-05 00:00:00 +05:30
+date: 2011-10-15 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -19,12 +19,9 @@ dependencies:
     requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
             version: 0.4.2
-        - - <
-          - !ruby/object:Gem::Version 
-            version: 0.4.99999
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -35,7 +32,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 0.1.0
+            version: 0.1.2
     type: :development
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -79,7 +76,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 0.8.3.0.3.0.28.3
+            version: 3.0.3.0.28.5
     type: :development
     version_requirements: *id006
 description: cache header control, dynamic configuration, and optimistic find on model via updated_at timestamp
@@ -93,49 +90,37 @@ extra_rdoc_files: []
 
 files: 
   - MIT-LICENSE
+  - README.md
   - lib/ixtlan-core.rb
-  - lib/generators/model/model_generator.rb
-  - lib/generators/scaffold/scaffold_generator.rb
-  - lib/generators/scaffold_controller/scaffold_controller_generator.rb
-  - lib/generators/rails/erb/erb_generator.rb
-  - lib/generators/rails/erb/scaffold/new.html.erb
-  - lib/generators/rails/erb/scaffold/_form.html.erb
-  - lib/generators/rails/erb/scaffold/index.html.erb
-  - lib/generators/rails/erb/scaffold/show.html.erb
-  - lib/generators/rails/erb/scaffold/edit.html.erb
-  - lib/generators/rails/scaffold_controller/scaffold_controller/controller.rb
-  - lib/generators/rails/scaffold_controller/scaffold_controller/singleton_controller.rb
-  - lib/generators/rails/active_record/active_record_generator.rb
-  - lib/generators/rails/active_record/model/model.rb
-  - lib/generators/rails/active_record/model/migration.rb
-  - lib/generators/ixtlan/base.rb
-  - lib/generators/ixtlan/configuration_scaffold/configuration_scaffold_generator.rb
-  - lib/generators/ixtlan/setup/setup_generator.rb
-  - lib/generators/ixtlan/setup/templates/database.yml.example
-  - lib/generators/ixtlan/setup/templates/error_with_session.html.erb
-  - lib/generators/ixtlan/setup/templates/error.html.erb
-  - lib/generators/ixtlan/setup/templates/application_layout.html.erb
-  - lib/generators/ixtlan/setup/templates/preinitializer.rb
-  - lib/generators/ixtlan/setup/templates/initializer.rb
-  - lib/generators/ixtlan/setup/templates/gitignore
-  - lib/generators/ixtlan/setup/templates/stale.html.erb
-  - lib/generators/ixtlan/setup/templates/production.yml.example
-  - lib/generators/ixtlan/configuration_model/configuration_model_generator.rb
+  - lib/ixtlan/core/x_xss_protection_headers.rb~
   - lib/ixtlan/core/x_frame_headers.rb
-  - lib/ixtlan/core/optimistic_data_mapper.rb
+  - lib/ixtlan/core/active_record.rb
   - lib/ixtlan/core/configuration_rack.rb
-  - lib/ixtlan/core/optimistic_active_record.rb
+  - lib/ixtlan/core/x_content_headers.rb~
+  - lib/ixtlan/core/data_mapper.rb~
+  - lib/ixtlan/core/active_record.rb~
   - lib/ixtlan/core/extra_headers.rb
   - lib/ixtlan/core/x_content_type_headers.rb
+  - lib/ixtlan/core/x_content_type_headers.rb~
   - lib/ixtlan/core/cache_headers.rb
+  - lib/ixtlan/core/optimistic_data_mapper.rb~
+  - lib/ixtlan/core/data_mapper.rb
   - lib/ixtlan/core/x_xss_protection_headers.rb
+  - lib/ixtlan/core/optimistic_active_record.rb~
   - lib/ixtlan/core/railtie.rb
   - lib/ixtlan/core/configuration_manager.rb
   - lib/ixtlan/core/controllers/configuration_controller.rb
+  - lib/ixtlan/core/controllers/configuration_controller.rb~
+  - spec/cache_headers_spec.rb~
   - spec/controller.rb
+  - spec/controller.rb~
   - spec/cache_headers_spec.rb
+  - spec/x_headers_spec.rb~
   - spec/x_headers_spec.rb
+  - spec/configuration_manager_spec.rb~
   - spec/configuration_manager_spec.rb
+  - features/step_definitions/simple_steps.rb
+  - features/headers.feature
 has_rdoc: true
 homepage: http://github.com/mkristian/ixtlan-core
 licenses: 
@@ -169,3 +154,5 @@ test_files:
   - spec/cache_headers_spec.rb
   - spec/x_headers_spec.rb
   - spec/configuration_manager_spec.rb
+  - features/headers.feature
+  - features/step_definitions/simple_steps.rb

data/lib/generators/ixtlan/base.rb

@@ -1,45 +0,0 @@
-require 'rails/generators/named_base'
-module Ixtlan
-  module Generators
-    class Base < Rails::Generators::Base
-
-      argument :name, :type => :string, :required => false
-
-      protected
-      def generator_name
-        raise "please overwrite generator_name"
-      end
-
-      public
-      def create
-        args = []
-        if name
-          args << ARGV.shift
-        else
-          args << "configuration"
-        end
-
-        if defined? ::Ixtlan::Errors
-          args << "errors_keep_dump:integer"
-          args << "errors_dir:string"
-          args << "errors_from:string"
-          args << "errors_to:string"
-        end
-
-        if defined? ::Ixtlan::Sessions
-          args << "idle_session_timeout:integer"
-        end
-
-        if defined? ::Ixtlan::Audit
-          args << "audit_keep_log:integer"
-        end
-        
-        args += ARGV[0, 10000] || []
-        
-        args << "--singleton"
-
-        generate generator_name, *args
-      end
-    end
-  end
-end

data/lib/generators/ixtlan/configuration_model/configuration_model_generator.rb

@@ -1,12 +0,0 @@
-require 'generators/ixtlan/base'
-module Ixtlan
-  module Generators
-    class ConfigurationModelGenerator < Base
-
-      protected
-      def generator_name
-        "model"
-      end
-    end
-  end
-end

data/lib/generators/ixtlan/configuration_scaffold/configuration_scaffold_generator.rb

@@ -1,12 +0,0 @@
-require 'generators/ixtlan/base'
-module Ixtlan
-  module Generators
-    class ConfigurationScaffoldGenerator < Base
-      
-      protected
-      def generator_name
-        "scaffold"
-      end
-    end
-  end
-end

data/lib/generators/ixtlan/setup/setup_generator.rb

@@ -1,38 +0,0 @@
-require 'rails/generators/base'
-module Ixtlan
-  module Generators
-    class SetupGenerator < Rails::Generators::Base
-
-      source_root File.expand_path('../templates', __FILE__)
-
-      def create_preinitializer_files
-        template 'preinitializer.rb', File.join('config', "preinitializer.rb")
-        template 'gitignore', File.join('config', ".gitignore")
-        template 'production.yml.example', File.join('config', "production.yml.example")
-        template 'database.yml.example', File.join('config', "database.yml.example")
-      end
-      
-      def create_initializer_file
-        template 'initializer.rb', File.join('config', "initializers", "ixtlan.rb")
-      end
-    
-      # TODO make only if template-engine is ERB
-      def error_templates
-        if defined? Ixtlan::Errors
-          views_dir = File.join('app', 'views', 'errors')
-          ['error', 'error_with_session', 'stale'].each do |f|
-            file = "#{f}.html.erb"
-            template file, File.join(views_dir, file)
-          end
-        end
-      end
-
-      def create_application_layout_file
-        if defined? Ixtlan::Sessions
-          layout = File.join('app', 'views', 'layouts', 'application.html.erb')
-          template 'application_layout.html.erb', layout
-        end
-      end
-    end
-  end
-end

data/lib/generators/ixtlan/setup/templates/application_layout.html.erb

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title><%= app_const_base %></title>
-  <%%= stylesheet_link_tag :all %>
-  <%%= javascript_include_tag :defaults %>
-  <%%= csrf_meta_tag %>
-  <%% if controller.respond_to?(:current_user) && controller.send(:current_user) != nil %>
-  <meta http-equiv="refresh" content="<%%= controller.send(:idle_session_timeout) * 60 + 5 %>" />
-  <%% end %>
-</head>
-<body>
-
-<%%= yield %>
-
-</body>
-</html>

data/lib/generators/ixtlan/setup/templates/database.yml.example

@@ -1,48 +0,0 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MySQL driver:
-#   gem install mysql
-# On Mac OS X:
-#   sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql
-# On Mac OS X Leopard:
-#   sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-#       This sets the ARCHFLAGS environment variable to your native architecture
-# On Windows:
-#   gem install mysql
-#       Choose the win32 build.
-#       Install MySQL and put its /bin directory on your path.
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql
-  encoding: utf8
-  reconnect: false
-  database: test_development
-  pool: 5
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql
-  encoding: utf8
-  reconnect: false
-  database: test_test
-  pool: 5
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
-
-production:
-  adapter: mysql
-  encoding: utf8
-  reconnect: false
-  database: CONFIG[:db][:database]
-  pool: 5
-  username: CONFIG[:db][:username]
-  password: CONFIG[:db][:password]
-  socket: /var/run/mysqld/mysqld.sock

data/lib/generators/ixtlan/setup/templates/error.html.erb

@@ -1 +0,0 @@
-<h1><%%= @notice %></h1>

data/lib/generators/ixtlan/setup/templates/error_with_session.html.erb

@@ -1 +0,0 @@
-<h1><%%= @notice %></h1>

data/lib/generators/ixtlan/setup/templates/gitignore

@@ -1,2 +0,0 @@
-production.yml
-*.example

data/lib/generators/ixtlan/setup/templates/initializer.rb

@@ -1,64 +0,0 @@
-# dynamic configuration through a Configuration singleton model
-
-# configuration model
-# -------------------
-# CONFIGURATION = Configuration
-# config.configuration_model = CONFIGURATION
-begin
-  config_instance = CONFIGURATION.instance
-rescue
-  # allow rake tasks to work without configuration migrated
-  return
-end
-
-# notification email on errors and dump directory for the system dump
-# the error dumps will be cleanup after the days to keeps dump expired
-# --------------------------------------------------------------------
-# config_instance.register("error_dumper") do |config|
-#   Rails.configuration.error_dumper.dump_dir = config.errors_dir
-#   Rails.configuration.error_dumper.email_from = config.errors_from
-#   Rails.configuration.error_dumper.email_to = config.errors_to
-#   Rails.configuration.error_dumper.keep_dumps = config.errors_keep_dump # days
-# end
-
-# idle session timeout configuration (in minutes)
-# -----------------------------------------------
-# config_instance.register("session_idle_timeout") do |config|
-#   Rails.configuration.session_idle_timeout = config.session_idle_timeout
-# end
-
-# audit log manager
-# -----------------
-
-# config.audit_manager.model = MyAudit # default: Audit
-# config.audit_manager.username_method = :username # default: :login
-
-# config_instance.register("audit_manager") do |config|
-#   Rails.configuration.audit_manager.keep_log = config.keep_log # days
-# end
-
-# --------------------
-# static configuration
-# --------------------
-
-# error dumper
-# ------------
-# notification email on errors and dump directory for the system dump. per 
-# default there is no email notification and if email_from or email_to is
-# missing then there is no email too
-
-# config.error_dumper.dump_dir = Rails.root + "/log/errors" # default: log/errors
-# config.error_dumper.email_from = "no-reply@example.com"
-# config.error_dumper.email_to = "developer1@example.com,developer2@example.com"
-# config.error_dumper.keep_dumps = 30 # days
-# config.skip_rescue_module = true # do not include the predefined Rescue 
-
-# idle session timeout configuration
-# ----------------------------------
-# config.session_idle_timeout = 30 #minutes
-
-# audit log manager
-# -----------------
-# config.audit_manager.model = MyAudit # default: Audit
-# config.audit_manager.username_method = :username # default: :login
-# config.audit_manager.keep_log = 30 # days