iqvoc_inflectionals 1.1.3 → 2.0.0

data/.travis.yml

@@ -0,0 +1,19 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+
+env:
+  - DB=sqlite
+  - DB=mysql
+
+before_script: ruby ./script/ci/travis_before_build.rb
+script: bundle exec rake iqvoc:setup:generate_secret_token db:drop db:create iqvoc:db:migrate_all test RAILS_ENV=test
+
+branches:
+  only:
+    - master
+
+notifications:
+  recipients:
+    - iqvoc@innoq.com

data/Gemfile

@@ -1,11 +1,18 @@
 source 'http://rubygems.org'
 
 gem 'rails',        '~> 3.2.1'
-gem 'iqvoc',        '~> 3.5.1'#, :path => '../iqvoc'
-gem 'iqvoc_skosxl', '~> 1.2.0'#, :path => '../iqvoc_skosxl'
+gem 'iqvoc',        '~> 4.0.0'#, :path => '../iqvoc'
+gem 'iqvoc_skosxl', '~> 2.0.0'#, :path => '../iqvoc_skosxl'
 
 group :development, :test do
-  gem 'sqlite3'
+  platforms :ruby do
+    gem 'mysql2'
+    gem 'sqlite3'
+  end
+  platforms :jruby do
+    gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'activerecord-jdbcmysql-adapter'
+  end
 end
 
 group :test do

data/Gemfile.lock

@@ -35,13 +35,13 @@ GEM
     builder (3.0.0)
     cancan (1.6.7)
     erubis (2.7.0)
-    fastercsv (1.5.4)
+    fastercsv (1.5.5)
     hike (1.2.1)
     i18n (0.6.0)
     iq_rdf (0.1.5)
       builder
       bundler
-    iqvoc (3.5.6)
+    iqvoc (4.0.0)
       authlogic
       bundler
       cancan
@@ -51,21 +51,24 @@ GEM
       kaminari
       rails (~> 3.2.1)
       rails_autolink
-    iqvoc_skosxl (1.2.3)
+      sass-rails (~> 3.2.5)
+      simple_form
+    iqvoc_skosxl (2.0.0)
       bundler
-      iqvoc (~> 3.5.1)
+      iqvoc (~> 4.0.0)
     journey (1.0.3)
     json (1.6.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    mail (2.4.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     multi_json (1.1.0)
+    mysql2 (0.3.11)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -82,7 +85,7 @@ GEM
       activesupport (= 3.2.2)
       bundler (~> 1.0)
       railties (= 3.2.2)
-    rails_autolink (1.0.5)
+    rails_autolink (1.0.9)
       rails (~> 3.1)
     railties (3.2.2)
       actionpack (= 3.2.2)
@@ -94,6 +97,14 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    sass (3.1.19)
+    sass-rails (3.2.5)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    simple_form (2.0.2)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
     spork (0.9.0)
     spork-testunit (0.0.8)
       spork (>= 0.6.0)
@@ -114,8 +125,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  iqvoc (~> 3.5.1)
-  iqvoc_skosxl (~> 1.2.0)
+  activerecord-jdbcmysql-adapter
+  activerecord-jdbcsqlite3-adapter
+  iqvoc (~> 4.0.0)
+  iqvoc_skosxl (~> 2.0.0)
+  mysql2
   rails (~> 3.2.1)
   spork
   spork-testunit

data/app/views/partials/inflectional/_base.html.erb

@@ -1,12 +1,12 @@
-<h4><%= t("txt.views.labels.inflectionals") %></h4>
-<% labels_inflectionals_values = label.send(klass.name.to_relation_name).map(&:value) %>
-<div class="relation">
+<div class="relation panel">
+  <h2><%= t("txt.views.labels.inflectionals") %></h2>
+  <% labels_inflectionals_values = label.send(klass.name.to_relation_name).map(&:value) %>
   <%= labels_inflectionals_values.join(', ') %>
   <%
-  all_inflectionals = Inflectional::Base.where(:value => labels_inflectionals_values).all
-  # subtract initial and current version from the inflectionals collection
-  inflectionals_labels = Iqvoc::XLLabel.base_class.find(all_inflectionals.map(&:label_id)-[label.published_version_id, label.id].compact)
-%>
+    all_inflectionals = Inflectional::Base.where(:value => labels_inflectionals_values).all
+    # subtract initial and current version from the inflectionals collection
+    inflectionals_labels = Iqvoc::XLLabel.base_class.find(all_inflectionals.map(&:label_id)-[label.published_version_id, label.id].compact)
+  %>
   <% if inflectionals_labels.present? %>
     <p><%= t("txt.views.labels.inflectionals_used_in") %></p>
     <ul>

data/app/views/partials/inflectional/_edit_base.html.erb

@@ -1,7 +1,8 @@
-<li>
-  <%= f.label :inflectionals_attributes, t("txt.views.labels.inflectionals") %>
-  <%= f.text_area :inflectionals_attributes,
-    :value => label.send(klass.name.to_relation_name).map(&:value).join("\n"),
+<%= f.input :inflectionals_attributes,
+  :as => :text,
+  :label => t("txt.views.labels.inflectionals"),
+  :value => label.send(klass.name.to_relation_name).map(&:value).join("\n"),
+  :input_html => {
     :rows => 10,
-    :cols => 40 %>
-</li>
+    :cols => 40
+  } %>

data/config/database.mysql.yml

@@ -0,0 +1,20 @@
+development:
+  adapter: mysql2
+  database: iqvoc_skosxl_development
+  username: root
+  password:
+  encoding: utf8
+
+test:
+  adapter: mysql2
+  database: iqvoc_skosxl_test
+  username: root
+  password:
+  encoding: utf8
+
+production:
+  adapter: mysql2
+  database: iqvoc_skosxl_production
+  username: root
+  password:
+  encoding: utf8

data/config/database.sqlite.yml

@@ -0,0 +1,17 @@
+development:
+  adapter: sqlite3
+  database: db/development.sqlite
+  timeout: 5000
+  pool: 5
+
+test:
+  adapter: sqlite3
+  database: db/test.sqlite
+  timeout: 5000
+  pool: 5
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite
+  timeout: 5000
+  pool: 5

data/iqvoc_inflectionals.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "iqvoc_inflectionals"
 
   s.add_dependency "rails", "~> 3.2.1"
-  s.add_dependency "iqvoc", "~> 3.5.1"
-  s.add_dependency "iqvoc_skosxl", "~> 1.2.0"
+  s.add_dependency "iqvoc", "~> 4.0.0"
+  s.add_dependency "iqvoc_skosxl", "~> 2.0.0"
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/iqvoc/inflectionals/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module Inflectionals
-    VERSION = "1.1.3"
+    VERSION = "2.0.0"
   end
 end

data/script/ci/travis_before_build.rb

@@ -0,0 +1 @@
+system "cp config/database.#{ENV['DB']}.yml config/database.yml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_inflectionals
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70116973005100 !ruby/object:Gem::Requirement
+  requirement: &70320989998600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,29 +23,29 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70116973005100
+  version_requirements: *70320989998600
 - !ruby/object:Gem::Dependency
   name: iqvoc
-  requirement: &70116973003740 !ruby/object:Gem::Requirement
+  requirement: &70320989997920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70116973003740
+  version_requirements: *70320989997920
 - !ruby/object:Gem::Dependency
   name: iqvoc_skosxl
-  requirement: &70116973003060 !ruby/object:Gem::Requirement
+  requirement: &70320989996680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70116973003060
+  version_requirements: *70320989996680
 description: ''
 email:
 - robert.glaser@innoq.com
@@ -54,6 +54,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -65,6 +66,8 @@ files:
 - config.ru
 - config/application.rb
 - config/boot.rb
+- config/database.mysql.yml
+- config/database.sqlite.yml
 - config/database.template.yml
 - config/engine.rb
 - config/environment.rb
@@ -89,6 +92,7 @@ files:
 - lib/iqvoc/inflectionals/version.rb
 - lib/iqvoc_inflectionals.rb
 - public/.gitkeep
+- script/ci/travis_before_build.rb
 - script/rails
 - test/test_helper.rb
 - test/unit/inflectional_test.rb
@@ -112,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: iqvoc_inflectionals
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: ''