locomotivecms_steam 1.0.0.pre.alpha.3 → 1.0.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b4546173ae3156b352326063ab3f4627794f376
-  data.tar.gz: cf990d7b68ff7214aea8b6751fbd21364242d9c6
+  metadata.gz: e8dd492e17a42930ea27866b0ea918ad91b126e3
+  data.tar.gz: 22c9afe5347bcca41f42e56d63b118dc049b0678
 SHA512:
-  metadata.gz: c99b54430322c95af6613c5092fe0d37098d312fa1d4b1552733e4fe28af2cacc17c3df3d7d3818909456290db94235a16720c3e0091de563e3cf8d7e4e027f1
-  data.tar.gz: 9d5dea9b461f371a46eec6f43ee8dfde680df5a3794098ea7c63d856232cb8100ed034958a34533de7cdf30450daa1a7643be39f8473ba27eeb02bff9c811132
+  metadata.gz: 106e73a7703b15425b7cd38fe16d7b4dd517e674a7ea1efcf9d1de93ea5f6ffb63e22d138219f78b1782168f63c92df4e432fa86740c39d1955607ee49e346b9
+  data.tar.gz: 6196fa5aafdfebffe83886d172d57650b1cb4368d05c525dd74e93b9f3f0e0aa8bedde39962cf74bac5e75c7d708a55a91c18f0e99888b9549b23827cb665c09

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.pre.alpha.3)
+    locomotivecms_steam (1.0.0.pre.beta.1)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
@@ -9,7 +9,7 @@ PATH
       dragonfly (~> 1.0.10)
       haml (~> 4.0.6)
       httparty (~> 0.13.5)
-      kramdown (~> 1.7.0)
+      kramdown (~> 1.8.0)
       locomotivecms-solid (~> 4.0.0.alpha2)
       locomotivecms_common (~> 0.0.4)
       mime-types (~> 2.6.1)
@@ -81,7 +81,7 @@ GEM
       rack (>= 1.3.0)
     eventmachine (1.0.7)
     execjs (2.5.2)
-    ffi (1.9.8)
+    ffi (1.9.10)
     haml (4.0.6)
       tilt
     hike (1.2.3)
@@ -99,7 +99,7 @@ GEM
     json_spec (1.1.4)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    kramdown (1.7.0)
+    kramdown (1.8.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
     locomotivecms-liquid (4.0.0.alpha2)
@@ -169,14 +169,14 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.4.1)
-    sass (3.4.14)
+    sass (3.4.16)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (2.12.3)
+    sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)

data/lib/locomotive/steam/adapters/filesystem/yaml_loaders/content_entry.rb

@@ -29,13 +29,13 @@ module Locomotive
             end
 
             def modify_for_selects(attributes)
-              content_type.selects.each do |field|
+              content_type.select_fields.each do |field|
                 attributes[:"#{field.name}_id"] = attributes.delete(field.name.to_sym)
               end
             end
 
             def modify_for_associations(attributes)
-              content_type.associations.each do |field|
+              content_type.association_fields.each do |field|
                 case field.type
                 when :belongs_to
                   modify_belongs_to_association(field, attributes)

data/lib/locomotive/steam/adapters/filesystem/yaml_loaders/site.rb

@@ -11,7 +11,7 @@ module Locomotive
             def load(scope)
               attributes = _load(File.join(site_path, 'config', 'site.yml'))
 
-              (attributes[:domains] ||= []) << 'localhost'
+              (attributes[:domains] ||= []).concat(%w(0.0.0.0 localhost))
 
               attributes[:picture] = File.expand_path(File.join(site_path, 'icon.png'))
 

data/lib/locomotive/steam/adapters/filesystem.rb

@@ -40,6 +40,11 @@ module Locomotive::Steam
         dataset.insert(entity)
         sanitizer.apply_to_entity_with_dataset(entity, dataset)
       end
+      entity
+    end
+
+    def delete(mapper, scope, entity)
+      # TODO: to be implemented
     end
 
     def find(mapper, scope, id)

data/lib/locomotive/steam/adapters/mongodb/command.rb

@@ -0,0 +1,31 @@
+module Locomotive::Steam
+  module Adapters
+    module MongoDB
+
+      class Command
+
+        def initialize(collection, mapper)
+          @collection = collection
+          @mapper     = mapper
+        end
+
+        def insert(entity)
+          # make sure the entity gets a valid id
+          entity[:_id] ||= BSON::ObjectId.new
+
+          serialized_entity = @mapper.serialize(entity)
+
+          @collection.insert(serialized_entity)
+
+          entity
+        end
+
+        def delete(entity)
+          @collection.find(_id: entity._id).remove if entity._id
+        end
+
+      end
+
+    end
+  end
+end

data/lib/locomotive/steam/adapters/mongodb.rb

@@ -4,6 +4,7 @@ require 'origin'
 require_relative 'mongodb/origin'
 require_relative 'mongodb/query'
 require_relative 'mongodb/dataset'
+require_relative 'mongodb/command'
 
 module Locomotive::Steam
 
@@ -27,6 +28,14 @@ module Locomotive::Steam
       query(mapper, scope) { where(_id: BSON::ObjectId.from_string(id)) }.first
     end
 
+    def create(mapper, scope, entity)
+      command(mapper).insert(entity)
+    end
+
+    def delete(mapper, scope, entity)
+      command(mapper).delete(entity)
+    end
+
     def key(name, operator)
       name.to_sym.__send__(operator.to_sym)
     end
@@ -50,6 +59,10 @@ module Locomotive::Steam
       Locomotive::Steam::Adapters::MongoDB::Query
     end
 
+    def command_klass
+      Locomotive::Steam::Adapters::MongoDB::Command
+    end
+
     def dataset(mapper, query)
       Locomotive::Steam::Adapters::MongoDB::Dataset.new do
         query.against(collection(mapper)).map do |attributes|
@@ -58,6 +71,10 @@ module Locomotive::Steam
       end
     end
 
+    def command(mapper)
+      command_klass.new(collection(mapper), mapper)
+    end
+
     def collection(mapper)
       session["locomotive_#{mapper.name}"]
     end

data/lib/locomotive/steam/entities/content_entry.rb

@@ -69,6 +69,10 @@ module Locomotive::Steam
       end
     end
 
+    def serialize
+      super.merge(content_type_id: content_type_id)
+    end
+
     def to_liquid
       Locomotive::Steam::Liquid::Drops::ContentEntry.new(self)
     end

data/lib/locomotive/steam/entities/content_type.rb

@@ -5,7 +5,8 @@ module Locomotive::Steam
     include Locomotive::Steam::Models::Entity
     extend Forwardable
 
-    def_delegators :fields, :associations, :selects
+    def_delegator :fields, :associations, :association_fields
+    def_delegator :fields, :selects, :select_fields
 
     def initialize(attributes = {})
       super({
@@ -27,7 +28,7 @@ module Locomotive::Steam
     end
 
     def localized_names
-      fields.localized_names + selects.map(&:name)
+      fields.localized_names + select_fields.map(&:name)
     end
 
     def label_field_name

data/lib/locomotive/steam/middlewares/site.rb

@@ -13,7 +13,7 @@ module Locomotive::Steam
 
         # render a simple message if the service was not able to find a site
         # based on the request.
-        render_no_site unless site
+        render_no_site if site.nil?
 
         # log anyway
         log_site(site)

data/lib/locomotive/steam/models/associations/belongs_to.rb

@@ -4,12 +4,21 @@ module Locomotive::Steam
     class BelongsToAssociation < ReferencedAssociation
 
       def __load__
-        name      = @options[:association_name]
-        target_id = @entity[:"#{name}_id"]
+        target_id = @entity[__target_key__]
         target    = @repository.find(target_id)
 
         # replace the proxy class by the real target entity
-        @entity[name] = target
+        @entity[__name__] = target
+      end
+
+      def __serialize__(attributes)
+        attributes[__target_key__] = attributes[__name__].try(:_id)
+
+        attributes.delete(__name__)
+      end
+
+      def __target_key__
+        :"#{__name__}_id"
       end
 
     end

data/lib/locomotive/steam/models/associations/embedded.rb

@@ -33,6 +33,10 @@ module Locomotive::Steam
         @repository.send(:"#{name}=", entity)
       end
 
+      def __serialize__(entity)
+        # TODO: not implemented yet
+      end
+
       def method_missing(name, *args, &block)
         @repository.send(name, *args, &block)
       end

data/lib/locomotive/steam/models/associations/many_to_many.rb

@@ -4,10 +4,9 @@ module Locomotive::Steam
     class ManyToManyAssociation < ReferencedAssociation
 
       def __load__
-        source_key = :"#{@options[:association_name].to_s.singularize}_ids"
         key = @repository.k(:_id, :in)
 
-        @repository.local_conditions[key] = @entity[source_key]
+        @repository.local_conditions[key] = @entity[__target_key__]
 
         # use order_by from options as the default one for further queries
         @repository.local_conditions[:order_by] = @options[:order_by] unless @options[:order_by].blank?
@@ -16,6 +15,17 @@ module Locomotive::Steam
         @repository
       end
 
+      def __serialize__(attributes)
+        attributes[__target_key__] = attributes[__name__].try(:map, &:_id)
+
+        attributes.delete(__name__)
+      end
+
+      def __target_key__
+        :"#{__name__.to_s.singularize}_ids"
+      end
+
+
     end
 
   end

data/lib/locomotive/steam/models/associations/referenced.rb

@@ -19,6 +19,10 @@ module Locomotive::Steam
         @options = options
       end
 
+      def __name__
+        @options[:association_name]
+      end
+
       def __attach__(entity)
         @entity = entity
       end
@@ -27,6 +31,10 @@ module Locomotive::Steam
         # needs implementation
       end
 
+      def __serialize__(entity)
+        # needs implementation
+      end
+
       def __call_block_once__
         # setup the repository if custom configuration from the
         # repository for instance.

data/lib/locomotive/steam/models/entity.rb

@@ -5,7 +5,7 @@ module Locomotive::Steam
 
       include Locomotive::Steam::Models::Concerns::Validation
 
-      attr_accessor :attributes, :localized_attributes, :base_url
+      attr_accessor :attributes, :associations, :localized_attributes, :base_url
 
       def initialize(attributes)
         @attributes = attributes.with_indifferent_access
@@ -14,6 +14,8 @@ module Locomotive::Steam
       def method_missing(name, *args, &block)
         if attributes.include?(name)
           self[name]
+        elsif name.to_s.end_with?('=') && attributes.include?(name.to_s.chop)
+          self[name.to_s.chop] = args.first
         else
           super
         end
@@ -35,6 +37,10 @@ module Locomotive::Steam
         attributes[name.to_sym]
       end
 
+      def serialize
+        attributes.dup
+      end
+
     end
   end
 end

data/lib/locomotive/steam/models/i18n_field.rb

@@ -36,6 +36,10 @@ module Locomotive::Steam
 
       alias :__translations__ :translations
 
+      def serialize(attributes)
+        attributes[@name] = @translations
+      end
+
     end
 
   end

data/lib/locomotive/steam/models/mapper.rb

@@ -48,11 +48,12 @@ module Locomotive::Steam
 
       def to_entity(attributes)
         entity_klass.new(deserialize(attributes)).tap do |entity|
-          attach_entity_to_associations(entity)
-
           set_default_attributes(entity)
 
           entity.localized_attributes = @localized_attributes_hash || {}
+          entity.associations = {}
+
+          attach_entity_to_associations(entity)
 
           entity.base_url = @repository.base_url(entity)
         end
@@ -64,6 +65,23 @@ module Locomotive::Steam
         attributes
       end
 
+      def serialize(entity)
+        entity.serialize.tap do |attributes|
+          # scope
+          @repository.scope.apply(attributes)
+
+          # localized fields
+          @localized_attributes.each do |name|
+            entity.send(name).serialize(attributes)
+          end
+
+          # association name -> id (belongs_to) or ids (many_to_many)
+          (entity.associations || {}).each do |name, association|
+            association.__serialize__(attributes)
+          end
+        end
+      end
+
       def entity_klass
         options[:entity]
       end
@@ -88,10 +106,7 @@ module Locomotive::Steam
         @associations.each do |(type, name, repository_klass, options, block)|
           klass = ASSOCIATION_CLASSES[type]
 
-          _options = options.merge({
-            association_name: name,
-            mapper_name:      self.name
-          })
+          _options = options.merge(association_name: name, mapper_name: self.name)
 
           attributes[name] = (if type == :embedded
             klass.new(repository_klass, attributes[name], @repository.scope, _options)
@@ -103,7 +118,10 @@ module Locomotive::Steam
 
       def attach_entity_to_associations(entity)
         @associations.each do |(type, name, _)|
-          entity[name].__attach__(entity)
+          association = entity[name]
+          association.__attach__(entity)
+
+          entity.associations[name] = association
         end
       end
 

data/lib/locomotive/steam/models/repository.rb

@@ -31,6 +31,10 @@ module Locomotive::Steam
         adapter.create(mapper, scope, entity)
       end
 
+      def delete(entity)
+        adapter.delete(mapper, scope, entity)
+      end
+
       def find(id)
         adapter.find(mapper, scope, id)
       end

data/lib/locomotive/steam/models/scope.rb

@@ -17,6 +17,10 @@ module Locomotive::Steam
         site.try(:locales)
       end
 
+      def apply(attributes)
+        attributes['site_id'] = @site._id
+      end
+
       def to_key
         (@site ? ['site', @site._id] : []).tap do |base|
           @context.each do |name, object|

data/lib/locomotive/steam/repositories/content_entry_repository.rb

@@ -140,7 +140,7 @@ module Locomotive
       end
 
       def add_associations_to_mapper(mapper)
-        self.content_type.associations.each do |field|
+        self.content_type.association_fields.each do |field|
           mapper.association(field.type, field.name, self.class, field.association_options, &method(:prepare_repository_for_association))
         end
       end

data/lib/locomotive/steam/services/translator_service.rb

@@ -17,10 +17,13 @@ module Locomotive
         if scope.blank?
           values = repository.by_key(input).try(:values) || {}
 
-          if translation = values[locale.to_s]
+          # FIXME: important to check if the returned value is nil (instead of nil + false)
+          # false being reserved for an existing key but without provided translation)
+          if (translation = values[locale.to_s]).present?
             translation
           else
             Locomotive::Common::Logger.warn "Missing translation '#{input}' for the '#{locale}' locale".yellow
+            ActiveSupport::Notifications.instrument('steam.missing_translation', input: input, locale: locale)
             input
           end
         else

data/lib/locomotive/steam/services.rb

@@ -15,12 +15,30 @@ module Locomotive
         end
       end
 
+      class SiteProxy < SimpleDelegator
+
+        def initialize(&block)
+          @site     = nil
+          @default  = block
+          super(@site)
+        end
+
+        def __getobj__
+          super || @default.call
+        end
+
+        def nil?
+          __getobj__.nil?
+        end
+
+      end
+
       class Instance < Struct.new(:request)
 
         include Morphine
 
         register :current_site do
-          repositories.current_site = site_finder.find
+          repositories.current_site = SiteProxy.new { site_finder.find }
         end
 
         register :repositories do
@@ -113,7 +131,7 @@ module Locomotive
         end
 
         def set_site(site)
-          self.current_site = repositories.current_site = site
+          self.current_site.__setobj__(site)
         end
 
       end

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive
   module Steam
-    VERSION = '1.0.0-alpha.3'
+    VERSION = '1.0.0-beta.1'
   end
 end

data/locomotivecms_steam.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'coffee-script',          '~> 2.4.1'
   spec.add_dependency 'compass',                '~> 1.0.3'
 
-  spec.add_dependency 'kramdown',               '~> 1.7.0'
+  spec.add_dependency 'kramdown',               '~> 1.8.0'
   spec.add_dependency 'RedCloth',               '~> 4.2.9'
   spec.add_dependency 'haml',                   '~> 4.0.6'
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'

data/spec/integration/repositories/content_entry_repository_spec.rb

@@ -56,6 +56,21 @@ describe Locomotive::Steam::ContentEntryRepository do
       it { expect(subject.map { |h| h[:entries].size }).to eq([2, 1, 0]) }
     end
 
+    describe '#create' do
+
+      let(:type) { type_repository.by_slug('songs') }
+      let(:attributes) { { title: 'Jeremy', band: 'pearl-jam', short_description: '"Jeremy" is a song by the American rock band Pearl Jam' } }
+      let(:entry) { repository.with(type).build(attributes) }
+
+      subject { repository.create(entry) }
+
+      it { expect { subject }.to change { repository.all.size } }
+      it { expect(subject._id).not_to eq nil }
+
+      after { repository.delete(entry) }
+
+    end
+
   end
 
   context 'MongoDB' do

data/spec/support/helpers.rb

@@ -43,5 +43,18 @@ module Spec
       Rack::MockRequest.env_for(url, opts)
     end
 
+    def notification_payload_for(notification)
+      payload = nil
+      subscription = ActiveSupport::Notifications.subscribe(notification) do |name, start, finish, id, _payload|
+        payload = _payload
+      end
+
+      yield
+
+      ActiveSupport::Notifications.unsubscribe(subscription)
+
+      return payload
+    end
+
   end
 end

data/spec/unit/adapters/filesystem/yaml_loaders/content_entry_spec.rb

@@ -6,7 +6,7 @@ require_relative '../../../../../lib/locomotive/steam/adapters/filesystem/yaml_l
 describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentEntry do
 
   let(:site_path)     { default_fixture_site_path }
-  let(:content_type)  { instance_double('Bands', _id: 42, slug: 'bands', associations: [], selects: []) }
+  let(:content_type)  { instance_double('Bands', _id: 42, slug: 'bands', association_fields: [], select_fields: []) }
   let(:scope)         { instance_double('Scope', locale: :en, context: { content_type: content_type }) }
   let(:loader)        { described_class.new(site_path) }
 
@@ -23,7 +23,7 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentEntry do
     context 'a content type with a belongs_to field' do
 
       let(:field)         { instance_double('Field', name: 'band', type: :belongs_to) }
-      let(:content_type)  { instance_double('Songs', slug: 'songs', associations: [field], selects: []) }
+      let(:content_type)  { instance_double('Songs', slug: 'songs', association_fields: [field], select_fields: []) }
 
       it 'adds a new attribute for the foreign key' do
         expect(subject.first[:band_id]).to eq 'pearl-jam'
@@ -36,7 +36,7 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentEntry do
     context 'a content type with a select field' do
 
       let(:field)         { instance_double('Field', name: 'kind', type: :select) }
-      let(:content_type)  { instance_double('Bands', slug: 'bands', selects: [field], associations: []) }
+      let(:content_type)  { instance_double('Bands', slug: 'bands', select_fields: [field], association_fields: []) }
 
       it 'adds a new attribute for the foreign key' do
         expect(subject.first[:kind_id]).to eq 'grunge'

data/spec/unit/models/mapper_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Models::Mapper do
 
-  let(:repository)  { instance_double('Repository', base_url: '') }
+  let(:adapter)     { instance_double('Adapter') }
+  let(:scope)       { instance_double('SimpleScope', apply: true) }
+  let(:repository)  { instance_double('Repository', scope: scope, base_url: '') }
   let(:name)        { 'pages' }
   let(:options)     { { entity: MyPage } }
   let(:block)       { nil }
@@ -17,6 +19,68 @@ describe Locomotive::Steam::Models::Mapper do
 
   end
 
+  describe '#serialize' do
+
+    let(:options) { { entity: MyArticle } }
+    let(:attributes) { { title: 'Hello world', body: 'Lorem ipsum', published_at: DateTime.parse('2007/06/29 00:00:00') } }
+    let(:entity) { mapper.to_entity(attributes) }
+
+    subject { mapper.serialize(entity) }
+
+    it { expect(subject).to eq('title' => 'Hello world', 'body' => 'Lorem ipsum', 'published_at' => DateTime.parse('2007/06/29 00:00:00')) }
+
+    describe 'association' do
+
+      let(:repository)  { instance_double('AuthorRepository', scope: scope, adapter: adapter, base_url: '') }
+
+      describe 'belongs_to' do
+
+        let(:block) { ->(_) { belongs_to_association(:author, BlankRepository) } }
+
+        context 'no object' do
+
+          let(:attributes) { { author_id: nil } }
+
+          it { expect(subject).to eq('author_id' => nil) }
+
+        end
+
+        context 'existing object' do
+
+          before { entity.author = instance_double('Author', _id: 1) }
+
+          it { expect(subject).to eq('title' => 'Hello world', 'author_id' => 1, 'body' => 'Lorem ipsum', 'published_at' => DateTime.parse('2007/06/29 00:00:00')) }
+
+        end
+
+      end
+
+      describe 'many_to_many' do
+
+        let(:block) { ->(_) { many_to_many_association(:authors, BlankRepository) } }
+
+        context 'no object' do
+
+          let(:attributes) { { author_ids: nil } }
+
+          it { expect(subject).to eq('author_ids' => nil) }
+
+        end
+
+        context 'existing object' do
+
+          before { entity.authors = [instance_double('Author', _id: 1), instance_double('Author', _id: 2)] }
+
+          it { expect(subject).to eq('title' => 'Hello world', 'author_ids' => [1, 2], 'body' => 'Lorem ipsum', 'published_at' => DateTime.parse('2007/06/29 00:00:00')) }
+
+        end
+
+      end
+
+    end
+
+  end
+
   describe '#to_entity' do
 
     subject { mapper.to_entity(attributes) }
@@ -68,6 +132,11 @@ describe Locomotive::Steam::Models::Mapper do
     attr_accessor :site
   end
 
+  class MyArticle
+    include Locomotive::Steam::Models::Entity
+    attr_accessor :site
+  end
+
   class BlankRepository < Struct.new(:adapter)
     attr_accessor :page, :scope
   end

data/spec/unit/repositories/content_entry_repository_spec.rb

@@ -242,7 +242,7 @@ describe Locomotive::Steam::ContentEntryRepository do
   describe 'belongs_to' do
 
     let(:field)   { instance_double('Field', name: :author, type: :belongs_to, association_options: { target_id: 2 }) }
-    let(:type)    { build_content_type('Articles', label_field_name: :title, associations: [field]) }
+    let(:type)    { build_content_type('Articles', label_field_name: :title, association_fields: [field]) }
     let(:entries) { [{ content_type_id: 1, title: 'Hello world', author_id: 'john-doe' }] }
     let(:other_type)    { build_content_type('Authors', _id: 2, label_field_name: :name, fields_by_name: { name: instance_double('Field', name: :name, type: :string) }) }
     let(:other_entries) { [{ content_type_id: 2, _id: 'john-doe', name: 'John Doe' }] }
@@ -269,7 +269,7 @@ describe Locomotive::Steam::ContentEntryRepository do
   describe 'has_many' do
 
     let(:field)   { instance_double('Field', name: :articles, type: :has_many, association_options: { target_id: 2, inverse_of: :author, order_by: 'position_in_author' }) }
-    let(:type)    { build_content_type('Authors', label_field_name: :name, associations: [field]) }
+    let(:type)    { build_content_type('Authors', label_field_name: :name, association_fields: [field]) }
     let(:entries) { [{ content_type_id: 1, _id: 'john-doe', name: 'John Doe' }] }
     let(:other_type) { build_content_type('Articles', _id: 2, label_field_name: :title, fields_by_name: { name: instance_double('Field', name: :title, type: :string) }) }
     let(:other_entries) {
@@ -302,7 +302,7 @@ describe Locomotive::Steam::ContentEntryRepository do
   describe 'many_to_many' do
 
     let(:field)   { instance_double('Field', name: :articles, type: :many_to_many, association_options: { target_id: 2, inverse_of: :authors }) }
-    let(:type)    { build_content_type('Authors', label_field_name: :name, associations: [field]) }
+    let(:type)    { build_content_type('Authors', label_field_name: :name, association_fields: [field]) }
     let(:entries) { [{ content_type_id: 1, _id: 1, name: 'John Doe', article_ids: ['hello-world', 'lorem-ipsum'] }] }
     let(:other_type)    { build_content_type('Articles', _id: 2, label_field_name: :title, fields_by_name: { name: instance_double('Field', name: :title, type: :string) }) }
     let(:other_entries) {
@@ -339,7 +339,7 @@ describe Locomotive::Steam::ContentEntryRepository do
         slug:                   name.to_s.downcase,
         order_by:               nil,
         localized_names:        [],
-        associations:           [],
+        association_fields:     [],
         fields_by_name:         {}
       }.merge(attributes))
   end

data/spec/unit/services/translator_service_spec.rb

@@ -12,25 +12,18 @@ describe Locomotive::Steam::TranslatorService do
     let(:locale)  { nil }
     let(:scope)   { nil }
 
+    before do
+      allow(repository).to receive(:by_key).with('example_test').and_return(translation)
+    end
+
     subject { service.translate(input, locale, scope) }
 
     describe 'existing translation' do
 
       let(:translation) { instance_double('Translation', values: { 'en' => 'Example text', 'es' => 'Texto de ejemplo' }) }
 
-      before do
-        allow(repository).to receive(:by_key).with('example_test').and_return(translation)
-      end
-
       it { is_expected.to eq 'Example text' }
 
-      context 'no translation found' do
-
-        let(:translation) { nil }
-        it { is_expected.to eq 'example_test' }
-
-      end
-
       context 'specifying a locale' do
 
         let(:locale) { 'es' }
@@ -40,15 +33,15 @@ describe Locomotive::Steam::TranslatorService do
 
       context "specifying a locale that doesn't exist" do
 
-        let(:locale) { 'nl' }
+        let(:locale) { puts 'NL'; 'nl' }
 
         it 'reverts to default locale' do
-          is_expected.to eq "example_test"
+          is_expected.to eq 'example_test'
         end
 
       end
 
-      context "specifying a scope" do
+      context 'specifying a scope' do
 
         let(:input)   { 'fr' }
         let(:locale)  { 'en' }
@@ -60,6 +53,21 @@ describe Locomotive::Steam::TranslatorService do
 
     end
 
+    describe 'missing translation' do
+
+      let(:locale)      { 'fr' }
+      let(:translation) { nil }
+
+      it { is_expected.to eq 'example_test' }
+
+      it 'sends a notification' do
+        payload = notification_payload_for('steam.missing_translation') { subject }
+        expect(payload[:input]).to eq 'example_test'
+        expect(payload[:locale]).to eq 'fr'
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.3
+  version: 1.0.0.pre.beta.1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -271,14 +271,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -419,6 +419,7 @@ files:
 - lib/locomotive/steam/adapters/memory/order.rb
 - lib/locomotive/steam/adapters/memory/query.rb
 - lib/locomotive/steam/adapters/mongodb.rb
+- lib/locomotive/steam/adapters/mongodb/command.rb
 - lib/locomotive/steam/adapters/mongodb/dataset.rb
 - lib/locomotive/steam/adapters/mongodb/origin.rb
 - lib/locomotive/steam/adapters/mongodb/query.rb