ixtlan 0.4.0.pre5 → 0.4.0

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 lib_path = (Pathname(__FILE__).dirname.parent.expand_path + 'lib').to_s
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 
+require 'extlib'
 require 'dm-core'
 require 'dm-validations'
 require 'dm-serializer'
@@ -9,25 +10,50 @@ require 'dm-timestamps'
 
 require 'slf4r'
 
-require 'ixtlan' / 'models'
-require 'ixtlan' / 'user_logger'
-require 'ixtlan' / 'modified_by'
-require 'ixtlan' / 'models' / 'audit'
-require 'ixtlan' / 'models' / 'domain'
-require 'ixtlan' / 'models' / 'locale'
-require 'ixtlan' / 'models' / 'group'
-require 'ixtlan' / 'models' / 'user'
-require 'ixtlan' / 'models' / 'configuration'
-require 'ixtlan' / 'models' / 'group_user'
-require 'ixtlan' / 'models' / 'group_locale_user'
-require 'ixtlan' / 'models' / 'permission'
-require 'ixtlan' / 'models' / 'role'
-require 'ixtlan' / 'models' / 'i18n_text'
-require 'ixtlan' / 'passwords'
-require 'ixtlan' / 'digest'
+require 'ixtlan/models'
+require 'ixtlan/modified_by'
+require 'ixtlan/passwords'
+require 'ixtlan/digest'
+
+require 'ixtlan/models/locale'
+class Locale
+  include Ixtlan::Models::Locale
+end
+require 'ixtlan/models/domain'
+class Domain
+  include Ixtlan::Models::Domain
+end
+require 'ixtlan/models/group'
+class Group
+  include Ixtlan::Models::Group
+end
+require 'ixtlan/models/user'
+class User
+  include Ixtlan::Models::User
+end
+require 'ixtlan/models/configuration'
+class Configuration
+  include Ixtlan::Models::Configuration
+end
+require 'ixtlan/models/audit'
+class Audit
+  include Ixtlan::Models::Audit
+end
+require 'ixtlan/models/group_user'
+require 'ixtlan/models/domain_group_user'
+require 'ixtlan/models/group_locale_user'
+require 'ixtlan/models/role'
+require 'ixtlan/models/permission'
+require 'ixtlan/models/i18n_text'
+class I18nText
+  include Ixtlan::Models::I18nText
+end
 
 #hide log output
-Slf4r::LoggerFacade4RubyLogger.file = StringIO.new
+Slf4r::LoggerFacade4RubyLogger.file = StringIO.new unless defined?(JRUBY_VERSION)
+
+
+require 'ixtlan/user_logger'
 
 module ActiveSupport
   class SecureRandom
@@ -51,6 +77,7 @@ module ActionController
     def self.filters
       @filters
     end
+
   end
 end
 class Request
@@ -65,18 +92,18 @@ class Controller
   include ActionController::Base
   def initialize
     @params = {}
-    u = Ixtlan::Models::User.first(:login => :marvin)
+    u = User.first(:login => :marvin)
     if u.nil?
-      u = Ixtlan::Models::User.new(:login => :marvin, :name => 'marvin the robot', :email=> "marvin@universe.example.com", :language => "xx", :id => 1, :created_at => DateTime.now, :updated_at => DateTime.now)
+      u = User.new(:login => :marvin, :name => 'marvin the robot', :email=> "marvin@universe.example.com", :language => "xx", :id => 111, :created_at => DateTime.now, :updated_at => DateTime.now)
       if(u.respond_to? :created_by_id)
-        u.created_by_id = 1
-        u.updated_by_id = 1
+        u.created_by_id = 111
+        u.updated_by_id = 111
       end
       u.save!
     end
     @password = u.reset_password
     u.save!
-    g = Ixtlan::Models::Group.first(:name => :admin) || Ixtlan::Models::Group.create(:name => :admin, :current_user => u)
+    g = Group.first(:name => :admin) || Group.create(:name => :admin, :current_user => u)
 #p g.errors
 #gg = Ixtlan::Models::Group.new(:name => :admin2, :current_user => u)
 #gg.save
@@ -85,8 +112,8 @@ class Controller
     Ixtlan::Models::GroupUser.all.destroy!
     Ixtlan::Models::GroupLocaleUser.all.destroy!
     u.groups << g
-    g.locales << Ixtlan::Models::Locale.default
-    g.locales << Ixtlan::Models::Locale.first_or_create(:code => "en")
+    g.locales << Locale.default
+    g.locales << (Locale.first(:code => "en") || Locale.create(:code => "en", :current_user => u))
     g.save
     @user = u
   end
@@ -101,6 +128,10 @@ class Controller
     @rendered = true
   end
 
+  def cache_headers(*args)
+    p *args
+  end
+
   def session_timeout
     a = Object.new
     def a.minutes
@@ -123,6 +154,16 @@ class Controller
 end
 
 DataMapper.setup(:default, :adapter => :in_memory)
+root  = User.new(:login => "marvin2", :name => 'marvin the robot', :email=> "marvin@universe.example.com", :language => "xx", :id => 1, :created_at => DateTime.now, :updated_at => DateTime.now)
+if(root.respond_to? :created_by_id)
+  root.created_by_id = 1
+  root.updated_by_id = 1
+end
+root.save!
+
+Locale.create(:code => "DEFAULT", :current_user => root)
+Locale.create(:code => "ALL", :current_user => root)
+Domain.create(:name => "ALL", :current_user => root)
 
 class String
   def cleanup
@@ -161,6 +202,7 @@ end
 
 class Object
   def self.full_const_get(clazz, ref = Object)
+    clazz = clazz.dup
     if clazz =~ /::/
       clazz.sub!(/^::/, '')
       ref = ref.const_get(clazz.sub(/::.*/, ''))

data/spec/text_collection_spec.rb

@@ -2,8 +2,6 @@
 require 'pathname'
 require Pathname(__FILE__).dirname + 'spec_helper.rb'
 
-require 'ixtlan/controllers/texts_controller'
-
 require 'ixtlan/models/i18n_text'
 require 'ixtlan/models/word'
 require 'ixtlan/models/translation'
@@ -13,29 +11,29 @@ describe "Ixtlan::Models::TextCollection" do
   len = 6
 
   before(:all) do
-    Controller.send(:include, Ixtlan::Controllers::TextsController)
-    @controller = Controller.new
-    Ixtlan::Models::Locale.all.destroy!
-    Ixtlan::Models::I18nText.all.destroy!
+    current_user = User.first
+    Locale.all.destroy!
+    Locale.create(:id => 1, :code => "DEFAULT", :current_user => current_user)
+    I18nText.all.destroy!
     (1..len).each do |i|
-      locale = Ixtlan::Models::Locale.first_or_create(:id => 10 + len + i, :code => "c#{(96 +i).chr}")
-      text = Ixtlan::Models::I18nText.create(:code => "code_#{i}",
+      locale = Locale.first(:id => 10 + len + i, :code => "c#{(96 +i).chr}") || Locale.create(:id => 10 + len + i, :code => "c#{(96 +i).chr}", :current_user => current_user) 
+      text = I18nText.create(:code => "code_#{i}",
                                              :text => "text_#{i}",
-                                             :current_user => @controller.current_user,
-                                             :locale => Ixtlan::Models::Locale.default,
+                                             :current_user => current_user,
+                                             :locale => Locale.default,
                                              :updated_at => DateTime.now,
-                                             :updated_by => @controller.current_user)
-      text.approve(:current_user => @controller.current_user)
+                                             :updated_by => current_user)
+      text.approve(:current_user => current_user)
       (1..len).each do |j|
-        text = Ixtlan::Models::I18nText.create(:code => "code_#{i}", :text => "text_#{i}_#{j}",
-:current_user => @controller.current_user, :locale => locale, :updated_at => DateTime.now, :updated_by => @controller.current_user)
-        text.approve(:current_user => @controller.current_user) unless j == len
+        text = I18nText.create(:code => "code_#{i}", :text => "text_#{i}_#{j}",
+:current_user => current_user, :locale => locale, :updated_at => DateTime.now, :updated_by => current_user)
+        text.approve(:current_user => current_user) unless j == len
       end
     end
   end
 
   it "should have #{len} second latest approved" do
-    set = Ixtlan::Models::I18nText.second_latest_approved
+    set = I18nText.second_latest_approved
     set.size.should == len
     set.each do |t|
       t.version.should_not be_nil
@@ -45,7 +43,7 @@ describe "Ixtlan::Models::TextCollection" do
   end
 
   it "should have #{len * 2} latest approved" do
-    set = Ixtlan::Models::I18nText.latest_approved
+    set = I18nText.latest_approved
     set.size.should == len * 2
     set.each do |t|
       t.version.should_not be_nil
@@ -55,7 +53,7 @@ describe "Ixtlan::Models::TextCollection" do
   end
 
   it "should have #{len} not approved" do
-    set = Ixtlan::Models::I18nText.not_approved
+    set = I18nText.not_approved
     set.size.should == len
     set.each do |t|
       t.version.should be_nil
@@ -65,22 +63,22 @@ describe "Ixtlan::Models::TextCollection" do
   end
 
   it "should have #{len * len} approved" do
-    Ixtlan::Models::I18nText.approved.size.should == len * len
+    I18nText.approved.size.should == len * len
   end
 
   it "should have #{len * (len - 3)} old approved" do
-    Ixtlan::Models::I18nText.all(:current => false, :previous => false, :version.not => nil).size.should == len * (len - 3)
+    I18nText.all(:current => false, :previous => false, :version.not => nil).size.should == len * (len - 3)
   end
 
   it "should have right number of approved when filterd by locale " do
-    locale = Ixtlan::Models::Locale.first_or_create(:code => "cb")
-    Ixtlan::Models::I18nText.approved(:locale => locale).size.should == len - 1
-    Ixtlan::Models::I18nText.latest_approved(:locale => locale).size.should == 1
-    Ixtlan::Models::I18nText.not_approved(:locale => locale).size.should == 1
+    locale = Locale.first_or_create(:code => "cb")
+    I18nText.approved(:locale => locale).size.should == len - 1
+    I18nText.latest_approved(:locale => locale).size.should == 1
+    I18nText.not_approved(:locale => locale).size.should == 1
   end
 
   it 'should setup the translation map' do
-    locale = Ixtlan::Models::Locale.first_or_create(:code => "cb")
+    locale = Locale.first_or_create(:code => "cb")
     map = Ixtlan::Models::Translation.map_for(:locale => locale)
     map.size.should == 1
     map.values[0].to_xml.gsub(/ type='[a-z:]*'/, '').gsub(/[0-9-]+T[0-9:]+\+[0-9:]+/, 'date').should == "<translation><text>text_2_5</text><previous_text>text_2_4</previous_text><approved_at>date</approved_at><approved_by_id>1</approved_by_id></translation>"

data/spec/text_spec.rb

@@ -12,10 +12,10 @@ describe Ixtlan::Models::I18nText do
 
   before(:each) do
     @controller = Controller.new
-    Ixtlan::Models::I18nText.all.destroy!
-    @approved = Ixtlan::Models::I18nText.create(:code => "code", :text => "other text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.default)
+    I18nText.all.destroy!
+    @approved = I18nText.create(:code => "code", :text => "other text", :current_user => @controller.current_user, :locale => Locale.default)
     @approved.approve(:current_user => @controller.current_user)
-    @text = Ixtlan::Models::I18nText.create(:code => "code", :text => "text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.default)
+    @text = I18nText.create(:code => "code", :text => "text", :current_user => @controller.current_user, :locale => Locale.default)
   end
 
   it "should create default" do
@@ -30,15 +30,15 @@ describe Ixtlan::Models::I18nText do
   end
 
   it 'should create translation' do
-    Ixtlan::Models::I18nText.create(:code => "code", :text => "text_en", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.first_or_create(:code => 'en')).new?.should be_false
+    I18nText.create(:code => "code", :text => "text_en", :current_user => @controller.current_user, :locale => Locale.first_or_create(:code => 'en')).new?.should be_false
   end
 
   it 'should not create' do
-     Ixtlan::Models::I18nText.create(:code => "code2", :text => "text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.first_or_create(:code => 'en')).new?.should be_true
+     I18nText.create(:code => "code2", :text => "text", :current_user => @controller.current_user, :locale => Locale.first_or_create(:code => 'en')).new?.should be_true
   end
 
   it 'should update' do
-    text = Ixtlan::Models::I18nText.create(:code => "update_code", :text => "text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.default)
+    text = I18nText.create(:code => "update_code", :text => "text", :current_user => @controller.current_user, :locale => Locale.default)
     text.update(:text => 'new text', :current_user => @controller.current_user)
     text.should be_true
     text.version.should be_nil
@@ -48,7 +48,7 @@ describe Ixtlan::Models::I18nText do
   end
 
   it 'should approve' do
-    text = Ixtlan::Models::I18nText.create(:code => "apporved_code", :text => "text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.default)
+    text = I18nText.create(:code => "apporved_code", :text => "text", :current_user => @controller.current_user, :locale => Locale.default)
     text.approved?.should be_false
     text.approve(:current_user => @controller.current_user).should be_true
     text.version.should_not be_nil
@@ -98,7 +98,7 @@ describe Ixtlan::Models::I18nText do
   end
 
   it 'should produce xml via the Word model' do
-    text = Ixtlan::Models::I18nText.create(:code => "word", :text => "word text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.default)
+    text = I18nText.create(:code => "word", :text => "word text", :current_user => @controller.current_user, :locale => Locale.default)
     Ixtlan::Models::Word.first(:code => "word").to_xml.should == "<word><code>word</code><text>word text</text></word>"
     Ixtlan::Models::Word.all(:id => @approved.id).to_xml(:collection_element_name => "words").should == "<words type='array'><word><code>code</code><text>other text</text></word></words>"
   end

data/spec/unrestful_authentication_spec.rb

@@ -2,8 +2,8 @@
 require 'pathname'
 require Pathname(__FILE__).dirname + 'spec_helper.rb'
 
-require 'ixtlan' / 'models' / 'authentication'
-require 'ixtlan' / 'rails' / 'unrestful_authentication'
+require 'ixtlan/models/authentication'
+require 'ixtlan/rails/unrestful_authentication'
 
 class Controller
 

data/spec/user_logger_spec.rb

@@ -2,6 +2,7 @@ require 'pathname'
 require Pathname(__FILE__).dirname + 'spec_helper.rb'
 
 require 'ixtlan/rails/session_timeout'
+
 class Response
   attr_accessor :content_type
   def initialize

data/spec/user_spec.rb

@@ -1,10 +1,7 @@
 require 'pathname'
 require Pathname(__FILE__).dirname + 'spec_helper.rb'
+require 'dm-migrations'
 
-User = Ixtlan::Models::User
-Group = Ixtlan::Models::Group
-Locale = Ixtlan::Models::Locale
-Domain = Ixtlan::Models::Domain
 describe Ixtlan::Models::User do
 
   before(:all) do
@@ -91,7 +88,7 @@ describe Ixtlan::Models::User do
     end
 
     it 'should be able to create an user without groups' do
-      u = User.new(:login => 'user', :email => 'user@example.com', :name => 'user', :current_user => @root)
+      u = User.new(:login => 'user_no_groups', :email => 'user_no_groups@example.com', :name => 'user', :current_user => @root)
       u.update_all_children(nil)
       u.save
 
@@ -101,7 +98,7 @@ describe Ixtlan::Models::User do
 
   describe 'user_admin and locales/domains_admin' do
     before(:each) do
-      @admin = User.create(:login => 'admin', :email => 'admin@example.com', :name => 'admin', :current_user => @root)
+      @admin = User.create(:login => 'admin_user', :email => 'admin_user@example.com', :name => 'admin', :current_user => @root)
       @admin.groups << @users
       @admin.groups << @locales
       @admin.groups << @domains
@@ -149,7 +146,7 @@ describe Ixtlan::Models::User do
   end
 
   describe 'user_admin without locales/domains' do
-    before(:each) do
+    before(:all) do
       @admin = User.create(:login => 'admin', :email => 'admin@example.com', :name => 'admin', :current_user => @root)
       @admin.groups << @users
       @admin.save
@@ -171,7 +168,7 @@ describe Ixtlan::Models::User do
     end
 
     it 'should be able to create an user without disallowed groups and locales' do
-      u = User.new(:login => 'user', :email => 'user@example.com', :name => 'user', :current_user => @admin)
+      u = User.new(:login => 'user_admin', :email => 'user_admin@example.com', :name => 'user', :current_user => @admin)
       u.update_all_children(@groups)
       u.save
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ixtlan
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
     - 0
     - 4
     - 0
-    - pre5
-  version: 0.4.0.pre5
+  version: 0.4.0
 platform: ruby
 authors: 
   - mkristian
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +05:30
+date: 2010-08-02 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -79,13 +78,13 @@ dependencies:
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
       requirements: 
-        - - "="
+        - - ~>
           - !ruby/object:Gem::Version 
             segments: 
               - 0
               - 3
-              - 2
-            version: 0.3.2
+              - 0
+            version: 0.3.0
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
@@ -131,9 +130,23 @@ dependencies:
     type: :runtime
     version_requirements: *id008
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: dm-sqlite-adapter
     prerelease: false
     requirement: &id009 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 0
+            version: 1.0.0
+    type: :development
+    version_requirements: *id009
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id010 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
@@ -143,7 +156,7 @@ dependencies:
               - 0
             version: 1.3.0
     type: :development
-    version_requirements: *id009
+    version_requirements: *id010
 description: this is set of rails and datamapper plugins for setting up a little more advanced rails application then the default rails generator does. the focus is on security and privacy as well a complete restful xml support.
 email: 
   - m.kristian@web.de
@@ -151,9 +164,14 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+  - History.txt
+  - README.txt
 files: 
+  - MIT-LICENSE
+  - History.txt
+  - README.txt
+  - Rakefile
   - lib/models.rb
   - lib/ixtlan.rb
   - lib/dm-serializer.rb
@@ -180,6 +198,7 @@ files:
   - lib/ixtlan/modified_by.rb
   - lib/ixtlan/optimistic_persistence_module.rb
   - lib/ixtlan/optimistic_persistence_validation.rb
+  - lib/ixtlan/version.rb.errors
   - lib/ixtlan/guard.rb
   - lib/ixtlan/passwords.rb
   - lib/ixtlan/monkey_patches.rb
@@ -263,12 +282,13 @@ files:
   - spec/passwords_spec.rb
   - spec/guards/samples.rb
 has_rdoc: true
-homepage: http://github.com/mkristian/ixtlan-core
+homepage: http://github.com/mkristian/ixtlan/ixtlan-core
 licenses: 
   - MIT-LICENSE
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+  - --main
+  - README.txt
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -280,13 +300,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-          - 1
-          - 3
-          - 1
-        version: 1.3.1
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: