oxymoron 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e5bb8616cbe619a7882f56676964ee6cbb8152
-  data.tar.gz: e397b26b8484342b3c12be317a3c0753d19a8a78
+  metadata.gz: a501cb321c5f88c00919bf2d430b892db77d5210
+  data.tar.gz: 43e60ce4f5a9217672155d15046134cb7d8f53ff
 SHA512:
-  metadata.gz: dae32170556468155fc670b6cef06b333c4bfe8e073381c81654825dfe7ffd0de160466ec5c2521462787697029728393a4cf66af0cc1bfcf3a2078a574b9696
-  data.tar.gz: c80cfa564daa7a0e3716ff231b3419b14bfec914d9ea5013352c95bd5c069e08d8b4f2a946477c22c655d22fb0946f2f0ba9b0067e8a0a1ac20ee04959bef6ac
+  metadata.gz: 74b1cb5f30f5ccfae633998c1223838d7614ceab09cafa4171c23df0c129a2e414f71e058e030ce9c121faa12a648e1ac4493eb3f9b411a0b98ffc629253b56c
+  data.tar.gz: e51323b78e8a8f7992795f9a89388dcdc25bd8abd45f4bf1b3e75244c21abfaef584d47baadf0bc0ae73013a5316202b3edc6ae49c914bce71b816a2061e7a57

data/README.md

@@ -1,339 +1,12 @@
 # Oxymoron
-
-[Example application](https://github.com/storuky/oxymoron_app)
-
-[Basic forum based on Oxymoron](https://github.com/storuky/forum)
-##Setup
-
-Add it to your Gemfile:
-
 ```
 gem 'oxymoron'
 ```
 
-## Basic settings (Asset Pipeline)
-
-Add dependencies to your application.js and application.css
-
-**application.js**
-```
-/*
-= require oxymoron/angular
-= require oxymoron/angular-resource
-= require oxymoron/angular-cookies
-= require oxymoron/angular-ui-router
-= require oxymoron/ng-notify
-= require oxymoron
-*/
-```
-
-**application.css**
-```
-/*
- *= require oxymoron/ng-notify
- */
-```
-
-## Advanced settings
-
-
-**config/initializers/oxymoron.rb**
-```
-Oxymoron::Config.setup do |c|
-  # change path for generated oxymoron.js
-  c.oxymoron_js_path = Rails.root.join('app', 'assets', 'javascripts', 'public') 
-  
-  # Change form builder. By default used OxymoronFormBuilder
-  c.form_builder = MyFormBuilder 
-  
-  # Disabled rewrite form_for method in ActionView::FormHelper. In this case use helpers oxymoron_form_for and oxymoron_field_for
-  c.rewrite_form_for = false 
-end
-```
-
-##Usage
-
-Next, you need to inject required modules 'oxymoron' and 'ui.router'
-
-**application.js**
-```
-angular.module('app', ['ui.router', 'oxymoron'])
-```
-
-Create file routes.js, which will contain the application SPA-routings. Method $stateProvider.rails() transform routes.rb to Angular UI Router states.
-
-**routes.js**
-```
-angular.module('app')
-  .config(['$stateProvider', function ($stateProvider) {
-    $stateProvider.rails()
-  }])
-```
-
-Disable layouts for all ajax query:
-
-**app/controllers/application_controller.rb**
-```
-class ApplicationController < ActionController::Base
-  layout proc {
-    if request.xhr?
-      false
-    else
-      index
-      'application' # or other layout
-    end
-  }
-  
-  private
-  def index
-    # In the production mode write this string into initializers/oxymoron.rb
-    ActionView::Base.default_form_builder = OxymoronBuilder
-  end
-end
-```
-
-Edit your layout with ui-view notation:
-
-**app/views/layouts/application**
-```
-= yield
-```
-to
-```
-ui-view
-```
-or for SEO-friendly
-```
-ui-view
-  div[ng-non-bindable]
-    = yield
-```
-
-
-All controllers methods must be wrapped with respond_to
-
-**Example:**
-```
-class PostsController < ActiveRecord::Base
-  before_action :set_post, only: [:show, :update, :destroy]
+[Read the docs](http://storuky.github.io/oxymoron/)
 
-  def index
-    respond_to do |format|
-      format.html
-      format.json {
-        @posts = Post.all
-        render json: @posts
-      }
-    end
-  end
-  
-  def show
-    respond_to do |format|
-      format.html
-      format.json {
-        render json: @post
-      }
-    end
-  end
-  
-  def new
-  end
-  
-  def edit
-  end
-  
-  def create
-    respond_to do |format|
-      format.json {
-        @post = Post.new post_params
-        if @post.save
-          render json: {post: @post, msg: "Post successfully created", redirect_to: "posts_path"}
-        else
-          render json: {errors: @post.errors, msg: @post.errors.full_messages.join(', ')}, status: 422
-        end
-      }
-    end
-  end
+**Oxymoron** is a new approach to build the architecture of SPA-applications. This gem makes a strong connection between server and client side. It is a fully complete framework based on [AngularJS](https://angularjs.org/) and [Ruby on Rails](https://github.com/rails/rails).
 
-  def update
-    respond_to do |format|
-      format.json {
-        if @post.update(post_params)
-          render json: {post: @post, msg: "Post successfully updated", redirect_to: "posts_path"}
-        else
-          render json: {errors: @post.errors, msg: @post.errors.full_messages.join(', ')}, status: 422
-        end
-      }
-    end
-  end
-
-  def destroy
-    respond_to do |format|
-      format.json {
-        @post.destroy
-        render json: {msg: "Post successfully deleted"}
-      }
-    end
-  end
-  
-  private
-    def set_post
-      @post = Post.find(params[:id])
-    end
-    
-    def post_params
-      params.require(:post).permit(:title, :description, :author)
-    end
-end
-```
-
-Oxymoron add some functionality for your AngularJS application. You can use *factory* whose name matches the name of your resources routes.rb. Do not forget to inject it, when it's required.
-In our case it is Post resource.
-
-```
-Post.query() // => GET /posts.json
-Post.get({id: id}) // => GET /posts/:id.json
-Post.new() // => GET /posts/new.json
-Post.edit({id: id}) // => GET /posts/:id/edit.json
-Post.create({post: post}) // => POST /posts.json
-Post.update({id: id, post: post}) // => PUT /posts/:id.json
-Post.destroy({id: id}) // => DELETE /posts/:id.json
-```
-
-Add AngularJS-controller "PostsCtrl"
-
-**Example:**
-
-```
-angular.module('app')
-  .controller('PostsCtrl', ['Post', 'action', function (Post, action) {
-    var ctrl = this;
-    
-    // Called only on '/posts'
-    action('index', function(){
-      ctrl.posts = Post.query();
-    });
-    
-    // Called only for '/posts/:id'
-    action('show', function (params){
-      ctrl.post = Post.get({id: params.id});
-    });
-    
-    // Called only on '/posts/new'
-    action('new', function(){
-      ctrl.post = Post.new();
-      ctrl.save = Post.create;
-    });
-    
-    // Called only for '/posts/:id/edit'
-    action('edit', function (params){
-      ctrl.post = Post.edit({id: params.id});
-      ctrl.save = Post.update;
-    })
-    
-    // Called only for '/posts/:id/edit' or '/posts/new'
-    action(['edit', 'new'], function(){
-      //
-    })
-    
-    // Called only for your custom resource method. For example: '/posts/some_method'
-    action('some_method', function(){
-      //
-    })
-    
-    // etc
-  }])
-```
-
-##Example Views
-**posts/index.html.slim**
-
-```
-h1 Posts
-
-input type="text" ng-model="search"
-
-table
-  thead
-    tr
-      th Date
-      th Title
-      th Author
-  tbody
-    tr ng-repeat="post in ctrl.posts | filter:search"
-      td
-        | {{post.created_at | date:"dd.MM.yyyy"}}
-      td
-        | {{post.title}}
-      td
-        | {{post.author}}
-```
-
-**posts/show.html.slim**
-```
-dl
-  dl Date
-  dd
-    | {{ctrl.post.created_at | date:"dd.MM.yyyy"}}
-  dl Title
-  dd
-    | {{ctrl.post.title}}
-  dl author
-  dd
-    | {{ctrl.post.author}}
-```
-
-**posts/new.html.slim**
-```
-h1 New post
-
-= render 'form'
-```
-
-**posts/edit.html.slim**
-```
-h1 Edit post
-
-= render 'form'
-```
-
-**posts/_form.html.slim**
-```
-= form_for Post.new do |f|
-  div
-    = f.label :title
-    = f.text_field :title
-  div
-    = f.label :description
-    = f.text_area :description
-  
-  = f.submit "Save"
-  
-```
-
-Use *ui-sref* insted of link_to helper
-```
-a ui-sref="posts_path" All posts
-a ui-sref="new_post_path" New post
-a ui-sref="edit_post_path({id: id})" Edit post
-a ui-sref="post_path({id: id})" Show
-```
-
-##Routes
-In window you can find *Routes* variable, which contains all routes of your app (such as JsRoutes).
-
-**Example**
-```
-Routes.posts_path() //=> '/posts'
-Routes.post_path({id: 1}) //=> '/posts/1'
-Routes.post_path({id: 1, format: "json"}) //=> '/posts/1.json'
-Routes.posts_url() //=> 'http://localhost:3000/posts'
-```
-If your expect that your controller method return an array, you must mark this routes with *is_array* property. If you do not, it throw an exception from angular.
-```
-resources :posts do
-  get 'my', is_array: true
-end
-```
+You can greatly accelerate the development of your applications with it. But not only that! The speed of your application will accelerate at times.
 
-Happy coding :)
+This gem contains the Angular Resources and UI Router States which are **automatically generated** from the Rails routes (from routes.rb). It also includes all the necessary configs and the most useful services and directives.

data/app/assets/javascripts/oxymoron/config/states.js.erb

@@ -48,7 +48,6 @@ angular.module("oxymoron.config.states", [])
             
             return Routes['<%= key %>_path'](params);
           },
-          reloadOnSearch: true,
           controller: '<%= value[:controller]%>',
           resolve: {
             action: ['$stateParams', function ($stateParams) {

data/lib/oxymoron/version.rb

@@ -1,3 +1,3 @@
 module Oxymoron
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/lib/oxymoron.rb

@@ -34,14 +34,16 @@ module Oxymoron
     def set_states route
       if route.verb.match("GET")
         path = route.path.spec.to_s.gsub('(.:format)', '')
-        url_matcher = "'#{path}'"
+        ui_params = (route.defaults[:ui_params] || []).join("&")
+        ui_params = ui_params.present? ? "?#{ui_params}" : ""
+        url_matcher = "'#{path}#{ui_params}'"
 
         route.path.required_names.each do |required_name|
           if requirement = route.requirements[required_name.to_sym]
             if requirement.is_a? Regexp
               requirement = requirement.to_s[7..-2]
             end
-            url_matcher = path.gsub(':'+required_name, "{#{required_name}:(?:#{requirement})}")
+            url_matcher = path.gsub(':'+required_name, "{#{required_name}:(?:#{requirement})}#{ui_params}")
             url_matcher = "$urlMatcherFactoryProvider.compile(\"#{url_matcher}\")"
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxymoron
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Kononenko Paul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print