ixtlan-configuration 0.2.0 → 0.2.1

data/README.md

@@ -1,10 +1,10 @@
 # ixtlan-configuration #
 
 * [![Build Status](https://secure.travis-ci.org/mkristian/ixtlan-configuration.png)](http://travis-ci.org/mkristian/ixtlan-configuration) 
-* [![Dependency Status](https://gemnasium.com/mkristian/ixtlan-ixtlan-configuration.png)](https://gemnasium.com/mkristian/ixtlan-ixtlan-configuration)
-* [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/mkristian/ixtlan-ixtlan-configuration)
+* [![Dependency Status](https://gemnasium.com/mkristian/ixtlan-configuration.png)](https://gemnasium.com/mkristian/ixtlan-configuration)
+* [![Code Climate](https://codeclimate.com/github/mkristian/ixtlan-configuration.png)](https://codeclimate.com/github/mkristian/ixtlan-configuration)
 
-persistent configuration for the xtlan series. with cuba for composition.
+persistent configuration for the xtlan series. includes a cuba 'controller' for composition.
 
 TODO usage
 ==========

data/lib/ixtlan/configuration/cuba.rb

@@ -33,10 +33,10 @@ module Ixtlan
         end
 
         on put do
-          updated_at = keeps( Configuration )[ 'updated_at' ]
-          config = Configuration.optimistic_get!( updated_at,
+          req_filter( Configuration )
+          config = Configuration.optimistic_get!( req_filter.updated_at,
                                                   Configuration.instance.id )
-          config.attributes = params
+          config.attributes = req_filter.params
           config.modified_by = current_user if config.dirty?
           config.save
           write config

data/lib/ixtlan/configuration/filter.rb

@@ -25,7 +25,10 @@ module Ixtlan
 
       add_context( :single,
                    :keep => [ :updated_at ],
-                   :except => [:id, :created_at, :updated_at, :modified_by_id] )
+                   :except => [ :id,
+                                :created_at,
+                                :updated_at,
+                                :modified_by_id ] )
 
     end
   end

data/lib/ixtlan/configuration/serializer.rb

@@ -22,12 +22,53 @@ require 'ixtlan/babel/serializer'
 
 class ConfigurationSerializer < Ixtlan::Babel::Serializer
 
-  add_context(:single,
-              :except => [:id, :modified_by_id],
-              :include => {
-                :modified_by => {
-                  :only => [:id, :login, :name]
+  METHODS = [ :base_url, :created_at, :updated_at ]
+  
+  if defined? Ixtlan::Session
+    METHODS << :idle_session_timeout
+  end
+
+  if defined? Ixtlan::Audit
+    METHODS << :audit_keep_logs
+  end
+
+  if defined? Ixtlan::Errors
+    METHODS << :errors_keep_dumps
+    METHODS << :errors_base_path
+    METHODS << :errors_from_email
+    METHODS << :errors_to_emails
+  end
+
+  if defined? Ixtlan::Remote
+    METHODS << :users_url 
+    METHODS << :users_token
+  end
+
+  if defined? Rack::Session::EncryptedCookie
+    METHODS << :encrypted_cookie_secret
+  end
+
+  if defined? Ixtlan::Gettext
+    METHODS << :flash_url 
+    METHODS << :translations_url 
+    METHODS << :translations_token
+  end
+
+  if defined?( Ixtlan::UserManagement::User ) && Ixtlan::UserManagement::User.respond_to?( :properties )
+    add_context(:single,
+                :only => [],
+                :methods => METHODS,
+                :include => {
+                  :modified_by => {
+                    :only => [],
+                    :methods => [:id, :login, :name]
+                  }
                 }
-              }
-             )
+                )
+  else
+    add_context(:single,
+                :only => [],
+                :methods => METHODS
+                )
+  end
 end

data/spec/configaration_serializer_spec.rb

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+require File.expand_path( File.join( File.dirname( __FILE__ ),
+                                     'spec_helper.rb' ) )
+
+require 'ixtlan/configuration/resource'
+require 'ixtlan/configuration/serializer'
+require 'ixtlan/configuration/filter'
+require 'ixtlan/babel/factory'
+
+describe Ixtlan::Configuration::Configuration do
+
+  subject do
+    c = Ixtlan::Configuration::Configuration.instance
+    c.modified_by = root
+    c.save
+    c
+  end
+
+  let( :root ) do
+    unless u = Ixtlan::UserManagement::User.first
+      u = Ixtlan::UserManagement::User.create( :login => 'root',
+                                               :name => 'Root',
+                                               :updated_at => DateTime.now )
+    end
+    u
+  end
+
+  let( :factory ) { Ixtlan::Babel::Factory.new }
+
+  it 'serializes' do
+    expected = {
+      "base_url"=>"http://localhost:3000",
+      "audit_keep_logs"=>30,
+      "errors_keep_dumps"=>30,
+      "errors_base_path"=>"/errors",
+      "errors_from_email"=>"no-reply@example.com",
+      "errors_to_emails"=>"developer@example.com",
+      "modified_by"=>{
+        "id"=>1,
+        "login"=>"root",
+        "name"=>"Root"
+      }
+    }
+    result = factory.new_serializer( subject ).to_hash
+    result.delete("created_at").wont_be_nil
+    result.delete("updated_at").wont_be_nil
+    result.must_equal expected
+  end
+
+  it 'filters' do
+    expected = {
+      "base_url"=>"http://localhost:3000",
+      "audit_keep_logs"=>30,
+      "errors_keep_dumps"=>30,
+      "errors_base_path"=>"/errors",
+      "errors_from_email"=>"no-reply@example.com",
+      "errors_to_emails"=>"developer@example.com"
+    }
+    json = factory.new_serializer( subject ).to_hash
+    result = factory.new_filter( subject.class ).filter_it( json ).to_hash
+    result[ :params ].must_equal expected
+    result[ 'updated_at' ].sub( /\..*$/, '').must_equal subject.updated_at.to_s.sub( /\+.*$/, '')
+  end
+end

data/spec/configaration_serializer_spec.rb~

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require '4foodiez/partner/partner_store_serializer'
+
+describe ForFoodiez::RestPartnerStoresSerializer do
+
+  subject { Ixtlan::Babel::Factory.new.new_serializer( stores ) }
+
+  let( :stores ){ ForFoodiez::RestPartnerStores.new( :stores => [ store ], :offset => 10, :total_count => 123 ) }
+
+  let( :store ){ Factory.partner_store }
+
+  it 'should serialize' do
+    expected = {
+      "offset"=>10,
+      "total_count"=>123,
+      "stores"=>[{
+                   "id"=>store.id,
+                   "longitude"=>-71.18972,
+                   "latitude"=>41.52639,
+                   # "name"=>"mine",
+                   "phone"=>"(91) 123-23",
+                   "fax"=>"[0]33 123/323",
+                   "url"=>"http://valentin.de",
+                   "mail"=>"mail@valentin.de",
+                   "address"=>"Valentin Museum, München",
+                   "description"=>"schöne eis-skulptur auf suppen-teller - leider geschmolzen",
+                   # "updated_at"=>"2013-02-17T14:58:41.55607318380+0530",
+                   "partner_id"=> store.partner.id,
+                   "modified_by"=>{
+                     "id"=>1,
+                     "login"=>"system",
+                     "name"=>"System"
+                   }
+                 }]
+    }
+    result = subject.to_hash
+    Docu.list_response( 'partner_stores', subject )
+    result['stores'][0].delete("updated_at").wont_be_nil
+    result['stores'][0].delete("name").wont_be_nil
+    result.must_equal expected
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,35 @@
+# single spec setup
+$LOAD_PATH.unshift File.join( File.dirname( File.expand_path( File.dirname( __FILE__ ) ) ),
+                              'lib' )
+require 'minitest/autorun'
+
+require 'dm-timestamps'
+require 'dm-migrations'
+require 'dm-validations'
+#DataMapper::Logger.new(STDOUT, :debug)
+
+#require 'ixtlan/session'
+require 'ixtlan/user_management/user_resource'
+require 'ixtlan/audit/resource'
+require 'ixtlan/errors/resource'
+require 'ixtlan/remote'
+require 'ixtlan/gettext'
+
+require 'ixtlan/configuration/resource'
+
+DataMapper.setup :default, 'sqlite3::memory:'
+DataMapper.finalize
+
+# single entry in pool for the memory sqlite3
+# otherwise sqlite3 sometimes does not find certain tables :(
+class DataObjects::Pooling::Pool
+
+  alias :initialize_old :initialize
+
+  def initialize(max_size, resource, args)
+    initialize_old( 1, resource, args)
+  end
+end
+
+DataObjects::Pooling.pools
+DataMapper.auto_migrate!

data/spec/spec_helper.rb~

@@ -0,0 +1,26 @@
+# single spec setup
+$LOAD_PATH.unshift File.join( File.dirname( File.expand_path( File.dirname( __FILE__ ) ) ),
+                              'lib' )
+require 'minitest/autorun'
+
+require 'cuba'
+ENV["MT_NO_EXPECTATIONS"] = "true"
+
+require 'mustard'
+
+module Mustard
+  class Failure < MiniTest::Assertion
+    def initialize( *args )
+      super
+      begin
+        raise
+      rescue => e
+        @result = e.backtrace.detect { |l| nil == ( l =~ /lib\/mustard/ || l =~ /spec\/spec_helper.rb/ ) }
+      end
+    end
+    
+    def backtrace
+      [@result]
+    end
+  end
+end

metadata

@@ -1,29 +1,205 @@
 --- !ruby/object:Gem::Specification
 name: ixtlan-configuration
 version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease:
-  version: 0.2.0
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: slf4r
+  name: cuba-api
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0.5'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0.5'
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.1'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.1'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: minitest
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: ixtlan-audit
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: ixtlan-error-handler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: ixtlan-remote
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: ixtlan-gettext
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: ixtlan-user-management
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: dm-timestamps
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: dm-validations
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
     none: false
   prerelease: false
   type: :development
@@ -35,40 +211,42 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/ixtlan-configuration.rb~
 - lib/ixtlan-configuration.rb
-- lib/ixtlan/core.rb~
-- lib/ixtlan/configuration.rb~
+- lib/ixtlan-configuration.rb~
 - lib/ixtlan/configuration.rb
-- lib/ixtlan/configuration/filter.rb~
+- lib/ixtlan/configuration.rb~
+- lib/ixtlan/core.rb~
 - lib/ixtlan/configuration/resource.rb
+- lib/ixtlan/configuration/cuba.rb~
 - lib/ixtlan/configuration/resource.rb~
+- lib/ixtlan/configuration/filter.rb~
+- lib/ixtlan/configuration/filter.rb
 - lib/ixtlan/configuration/cuba.rb
 - lib/ixtlan/configuration/serializer.rb
-- lib/ixtlan/configuration/cuba.rb~
-- lib/ixtlan/configuration/filter.rb
+- spec/configaration_serializer_spec.rb
+- spec/configaration_serializer_spec.rb~
+- spec/spec_helper.rb~
+- spec/spec_helper.rb
 homepage: http://github.com/mkristian/ixtlan-configuration
 licenses:
 - MIT
 post_install_message:
 rdoc_options:
-- "--main"
+- --main
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project:
@@ -76,4 +254,5 @@ rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: configuration for other ixtlan-xyz wth serializer, input-filter and cuba definition
-test_files: []
+test_files:
+- spec/configaration_serializer_spec.rb